diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/multiplex.sh | 39 |
2 files changed, 25 insertions, 19 deletions
@@ -6,6 +6,9 @@ | |||
6 | [regress/multiplex.sh] | 6 | [regress/multiplex.sh] |
7 | Remove datafile between and after tests, kill sshd rather than wait; | 7 | Remove datafile between and after tests, kill sshd rather than wait; |
8 | ok djm@ | 8 | ok djm@ |
9 | - dtucker@cvs.openbsd.org 2004/06/17 06:00:05 | ||
10 | [regress/multiplex.sh] | ||
11 | Use DATA and COPY for test data rather than hard-coded paths; ok djm@ | ||
9 | 12 | ||
10 | 20040616 | 13 | 20040616 |
11 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No | 14 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No |
@@ -1260,4 +1263,4 @@ | |||
1260 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1263 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1261 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1264 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1262 | 1265 | ||
1263 | $Id: ChangeLog,v 1.3400 2004/06/17 06:27:43 dtucker Exp $ | 1266 | $Id: ChangeLog,v 1.3401 2004/06/17 06:32:45 dtucker Exp $ |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index fb4927e62..9fea117bd 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,41 +1,44 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.4 2004/06/17 06:00:05 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=$OBJ/ctl-sock | 4 | CTL=$OBJ/ctl-sock |
5 | 5 | ||
6 | tid="connection multiplexing" | 6 | tid="connection multiplexing" |
7 | 7 | ||
8 | DATA=/bin/ls | ||
9 | COPY=$OBJ/ls.copy | ||
10 | |||
8 | start_sshd | 11 | start_sshd |
9 | 12 | ||
10 | trace "start master, fork to background" | 13 | trace "start master, fork to background" |
11 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60 | 14 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60 |
12 | 15 | ||
13 | rm -f $OBJ/ls.copy | 16 | rm -f ${COPY} |
14 | trace "ssh transfer over multiplexed connection and check result" | 17 | trace "ssh transfer over multiplexed connection and check result" |
15 | ${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy | 18 | ${SSH} -S$CTL otherhost cat ${DATA} > ${COPY} |
16 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 19 | test -f ${COPY} || fail "failed copy ${DATA}" |
17 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 20 | cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |
18 | 21 | ||
19 | rm -f $OBJ/ls.copy | 22 | rm -f ${COPY} |
20 | trace "ssh transfer over multiplexed connection and check result" | 23 | trace "ssh transfer over multiplexed connection and check result" |
21 | ${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy | 24 | ${SSH} -S $CTL otherhost cat ${DATA} > ${COPY} |
22 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 25 | test -f ${COPY} || fail "failed copy ${DATA}" |
23 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 26 | cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |
24 | 27 | ||
25 | rm -f $OBJ/ls.copy | 28 | rm -f ${COPY} |
26 | trace "sftp transfer over multiplexed connection and check result" | 29 | trace "sftp transfer over multiplexed connection and check result" |
27 | echo "get /bin/ls $OBJ/ls.copy" | \ | 30 | echo "get ${DATA} ${COPY}" | \ |
28 | ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1 | 31 | ${SFTP} -oControlPath=$CTL otherhost >/dev/null 2>&1 |
29 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 32 | test -f ${COPY} || fail "failed copy ${DATA}" |
30 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 33 | cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |
31 | 34 | ||
32 | rm -f $OBJ/ls.copy | 35 | rm -f ${COPY} |
33 | trace "scp transfer over multiplexed connection and check result" | 36 | trace "scp transfer over multiplexed connection and check result" |
34 | ${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1 | 37 | ${SCP} -oControlPath=$CTL otherhost:${DATA} ${COPY} >/dev/null 2>&1 |
35 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 38 | test -f ${COPY} || fail "failed copy ${DATA}" |
36 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 39 | cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}" |
37 | 40 | ||
38 | rm -f $OBJ/ls.copy | 41 | rm -f ${COPY} |
39 | 42 | ||
40 | for s in 0 1 4 5 44; do | 43 | for s in 0 1 4 5 44; do |
41 | trace "exit status $s over multiplexed connection" | 44 | trace "exit status $s over multiplexed connection" |