summaryrefslogtreecommitdiff
path: root/regress/usr.bin/ssh/multiplex.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2004-06-17 05:52:00 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2004-06-17 05:52:00 +0000
commit7cb3f504af0922352c6bc1857cec879ea6143e2c (patch)
treea17723e5b13299e2ac8f93cd6ca8712aa2f6f1b9 /regress/usr.bin/ssh/multiplex.sh
parenta25ddba9b5b59e4627d4c0b0162db1108dd6a6b7 (diff)
Remove datafile between and after tests, kill sshd rather than wait; ok djm@
Diffstat (limited to 'regress/usr.bin/ssh/multiplex.sh')
-rw-r--r--regress/usr.bin/ssh/multiplex.sh10
1 files changed, 8 insertions, 2 deletions
diff --git a/regress/usr.bin/ssh/multiplex.sh b/regress/usr.bin/ssh/multiplex.sh
index 9940f15cb4a..fb4927e6212 100644
--- a/regress/usr.bin/ssh/multiplex.sh
+++ b/regress/usr.bin/ssh/multiplex.sh
@@ -1,4 +1,4 @@
-# $OpenBSD: multiplex.sh,v 1.2 2004/06/16 13:16:40 dtucker Exp $
+# $OpenBSD: multiplex.sh,v 1.3 2004/06/17 05:51:59 dtucker Exp $
# Placed in the Public Domain.
CTL=$OBJ/ctl-sock
@@ -10,11 +10,13 @@ start_sshd
trace "start master, fork to background"
${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
+rm -f $OBJ/ls.copy
trace "ssh transfer over multiplexed connection and check result"
${SSH} -S$CTL otherhost cat /bin/ls > $OBJ/ls.copy
test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
+rm -f $OBJ/ls.copy
trace "ssh transfer over multiplexed connection and check result"
${SSH} -S $CTL otherhost cat /bin/ls > $OBJ/ls.copy
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
test -f $OBJ/ls.copy || fail "failed copy /bin/ls"
cmp /bin/ls $OBJ/ls.copy || fail "corrupted copy of /bin/ls"
+rm -f $OBJ/ls.copy
+
for s in 0 1 4 5 44; do
trace "exit status $s over multiplexed connection"
verbose "test $tid: status $s"
@@ -52,4 +56,6 @@ for s in 0 1 4 5 44; do
fi
done
-sleep 30 # early close test sleeps 5 seconds per test
+# kill master, remove control socket. ssh -MS will exit when sleep exits
+$SUDO kill `cat $PIDFILE`
+rm -f $CTL