diff options
| author | Damien Miller <djm@mindrot.org> | 2023-01-09 16:33:56 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2023-01-09 16:33:56 +1100 |
| commit | 4a5590a5ee47b7dfd49773e9fdba48ad3089fe64 (patch) | |
| tree | 12b56001f40da12c949c3f6c3ffe8a2cf26209f6 | |
| parent | 715bc25dcfccf9fb2bee820155fe071d01a618db (diff) | |
try to improve logging for dynamic-forward test
previously the logs from the ssh used to exercise the forwarding
channel would clobber the logs from the ssh actually doing the
forwarding
| -rw-r--r-- | regress/dynamic-forward.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 781fc3fc..55f69219 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -24,7 +24,7 @@ start_ssh() { (cat $OBJ/ssh_config.orig ; echo "$arg") > $OBJ/ssh_config while [ "$error" -ne 0 -a "$n" -lt 3 ]; do n=`expr $n + 1` - ${SSH} -F $OBJ/ssh_config -f -vvv -E$TEST_SSH_LOGFILE \ + ${REAL_SSH} -F $OBJ/ssh_config -f -vvv -E$TEST_SSH_LOGFILE \ -$direction $FWDPORT -oExitOnForwardFailure=yes \ somehost exec sh -c \ \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' @@ -57,7 +57,7 @@ check_socks() { for s in 4 5; do for h in 127.0.0.1 localhost; do trace "testing ssh socks version $s host $h (-$direction)" - ${SSH} -F $OBJ/ssh_config \ + ${REAL_SSH} -q -F $OBJ/ssh_config \ -o "ProxyCommand ${proxycmd}${s} $h $PORT 2>/dev/null" \ somehost cat ${DATA} > ${COPY} r=$? |