diff options
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r-- | regress/multiplex.sh | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 817ddbfa8..4744fa3d9 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.32 2020/01/25 02:57:53 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.33 2020/06/24 15:16:23 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | make_tmpdir | 4 | make_tmpdir |
@@ -97,22 +97,24 @@ kill $netcat_pid 2>/dev/null | |||
97 | rm -f ${COPY} $OBJ/unix-[123].fwd | 97 | rm -f ${COPY} $OBJ/unix-[123].fwd |
98 | 98 | ||
99 | for s in 0 1 4 5 44; do | 99 | for s in 0 1 4 5 44; do |
100 | trace "exit status $s over multiplexed connection" | 100 | for mode in "" "-Oproxy"; do |
101 | verbose "test $tid: status $s" | 101 | trace "exit status $s over multiplexed connection ($mode)" |
102 | ${SSH} -F $OBJ/ssh_config -S $CTL otherhost exit $s | 102 | verbose "test $tid: status $s ($mode)" |
103 | ${SSH} -F $OBJ/ssh_config -S $CTL $mode otherhost exit $s | ||
103 | r=$? | 104 | r=$? |
104 | if [ $r -ne $s ]; then | 105 | if [ $r -ne $s ]; then |
105 | fail "exit code mismatch: $r != $s" | 106 | fail "exit code mismatch: $r != $s" |
106 | fi | 107 | fi |
107 | 108 | ||
108 | # same with early close of stdout/err | 109 | # same with early close of stdout/err |
109 | trace "exit status $s with early close over multiplexed connection" | 110 | trace "exit status $s with early close over multiplexed connection ($mode)" |
110 | ${SSH} -F $OBJ/ssh_config -S $CTL -n otherhost \ | 111 | ${SSH} -F $OBJ/ssh_config -S $CTL -n $mode otherhost \ |
111 | exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\' | 112 | exec sh -c \'"sleep 2; exec > /dev/null 2>&1; sleep 3; exit $s"\' |
112 | r=$? | 113 | r=$? |
113 | if [ $r -ne $s ]; then | 114 | if [ $r -ne $s ]; then |
114 | fail "exit code (with sleep) mismatch: $r != $s" | 115 | fail "exit code (with sleep) mismatch: $r != $s" |
115 | fi | 116 | fi |
117 | done | ||
116 | done | 118 | done |
117 | 119 | ||
118 | verbose "test $tid: cmd check" | 120 | verbose "test $tid: cmd check" |