diff options
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | regress/multiplex.sh | 10 |
2 files changed, 14 insertions, 3 deletions
@@ -1,6 +1,11 @@ | |||
1 | 20040617 | 1 | 20040617 |
2 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some | 2 | - (dtucker) [regress/scp.sh] diff -N is not portable (but needed for some |
3 | platforms), so test if diff understands it. Pointed out by tim@, ok djm@ | 3 | platforms), so test if diff understands it. Pointed out by tim@, ok djm@ |
4 | - (dtucker) OpenBSD CVS Sync regress/ | ||
5 | - dtucker@cvs.openbsd.org 2004/06/17 05:51:59 | ||
6 | [regress/multiplex.sh] | ||
7 | Remove datafile between and after tests, kill sshd rather than wait; | ||
8 | ok djm@ | ||
4 | 9 | ||
5 | 20040616 | 10 | 20040616 |
6 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No | 11 | - (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No |
@@ -1255,4 +1260,4 @@ | |||
1255 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 1260 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
1256 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 1261 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
1257 | 1262 | ||
1258 | $Id: ChangeLog,v 1.3399 2004/06/17 05:18:32 dtucker Exp $ | 1263 | $Id: ChangeLog,v 1.3400 2004/06/17 06:27:43 dtucker Exp $ |
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index 9940f15cb..fb4927e62 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 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 |
@@ -10,11 +10,13 @@ start_sshd | |||
10 | trace "start master, fork to background" | 10 | trace "start master, fork to background" |
11 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60 | 11 | ${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60 |
12 | 12 | ||
13 | rm -f $OBJ/ls.copy | ||
13 | trace "ssh transfer over multiplexed connection and check result" | 14 | trace "ssh transfer over multiplexed connection and check result" |
14 | ${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy | 15 | ${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy |
15 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 16 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" |
16 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 17 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" |
17 | 18 | ||
19 | rm -f $OBJ/ls.copy | ||
18 | trace "ssh transfer over multiplexed connection and check result" | 20 | trace "ssh transfer over multiplexed connection and check result" |
19 | ${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy | 21 | ${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy |
20 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 22 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" |
@@ -33,6 +35,8 @@ ${SCP} -oControlPath=$CTL otherhost:/bin/ls $OBJ/ls.copy >/dev/null 2>&1 | |||
33 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" | 35 | test -f $OBJ/ls.copy || fail "failed copy /bin/ls" |
34 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" | 36 | cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls" |
35 | 37 | ||
38 | rm -f $OBJ/ls.copy | ||
39 | |||
36 | for s in 0 1 4 5 44; do | 40 | for s in 0 1 4 5 44; do |
37 | trace "exit status $s over multiplexed connection" | 41 | trace "exit status $s over multiplexed connection" |
38 | verbose "test $tid: status $s" | 42 | verbose "test $tid: status $s" |
@@ -52,4 +56,6 @@ for s in 0 1 4 5 44; do | |||
52 | fi | 56 | fi |
53 | done | 57 | done |
54 | 58 | ||
55 | sleep 30 # early close test sleeps 5 seconds per test | 59 | # kill master, remove control socket. ssh -MS will exit when sleep exits |
60 | $SUDO kill `cat $PIDFILE` | ||
61 | rm -f $CTL | ||