diff options
author | Damien Miller <djm@mindrot.org> | 2014-08-01 12:28:31 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2014-08-01 12:28:31 +1000 |
commit | 5b3879fd4b7a4e3d43bab8f40addda39bc1169d0 (patch) | |
tree | e2d915de68e424224dd775fac82b20befeab4a9c /regress | |
parent | a9c46746d266f8a1b092a72b2150682d1af8ebfc (diff) |
- (djm) [regress/multiplex.sh] Instruct nc not to quit as soon as stdin
is closed; avoid regress failures when stdin is /dev/null
Diffstat (limited to 'regress')
-rw-r--r-- | regress/multiplex.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 377281a0c..aaeba7f96 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -93,7 +93,7 @@ trace "forward over TCP/IP and check result" | |||
93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & | 93 | $NC -l 127.0.0.1 $((${PORT} + 1)) < ${DATA} & |
94 | netcat_pid=$! | 94 | netcat_pid=$! |
95 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1 | 95 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L127.0.0.1:$((${PORT} + 2)):127.0.0.1:$((${PORT} + 1)) otherhost >>$TEST_SSH_LOGFILE 2>&1 |
96 | $NC 127.0.0.1 $((${PORT} + 2)) > ${COPY} | 96 | $NC -q5 127.0.0.1 $((${PORT} + 2)) > ${COPY} < /dev/null |
97 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" | 97 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" |
98 | kill $netcat_pid 2>/dev/null | 98 | kill $netcat_pid 2>/dev/null |
99 | rm -f ${COPY} $OBJ/unix-[123].fwd | 99 | rm -f ${COPY} $OBJ/unix-[123].fwd |
@@ -103,7 +103,7 @@ $NC -Ul $OBJ/unix-1.fwd < ${DATA} & | |||
103 | netcat_pid=$! | 103 | netcat_pid=$! |
104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 104 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -L$OBJ/unix-2.fwd:$OBJ/unix-1.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 | 105 | ${SSH} -F $OBJ/ssh_config -S $CTL -Oforward -R$OBJ/unix-3.fwd:$OBJ/unix-2.fwd otherhost >>$TEST_SSH_LOGFILE 2>&1 |
106 | $NC -U $OBJ/unix-3.fwd > ${COPY} | 106 | $NC -q5 -U $OBJ/unix-3.fwd > ${COPY} </dev/null |
107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" | 107 | cmp ${DATA} ${COPY} || fail "ssh: corrupted copy of ${DATA}" |
108 | kill $netcat_pid 2>/dev/null | 108 | kill $netcat_pid 2>/dev/null |
109 | rm -f ${COPY} $OBJ/unix-[123].fwd | 109 | rm -f ${COPY} $OBJ/unix-[123].fwd |