summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--regress/multiplex.sh20
2 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index aec54e436..3b50d2e55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,8 +22,11 @@
22 from ssh and sshd for the failing tests (and only the failing tests) should 22 from ssh and sshd for the failing tests (and only the failing tests) should
23 be available in failed-ssh{,d}.log. 23 be available in failed-ssh{,d}.log.
24 - djm@cvs.openbsd.org 2013/04/18 02:46:12 24 - djm@cvs.openbsd.org 2013/04/18 02:46:12
25 [Makefile regress/sftp-chroot.sh] 25 [regress/Makefile regress/sftp-chroot.sh]
26 test sshd ChrootDirectory+internal-sftp; feedback & ok dtucker@ 26 test sshd ChrootDirectory+internal-sftp; feedback & ok dtucker@
27 - dtucker@cvs.openbsd.org 2013/04/22 07:23:08
28 [multiplex.sh]
29 Write mux master logs to regress.log instead of ssh.log to keep separate
27 30
2820130516 3120130516
29 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 32 - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 6491837a4..619fec9b9 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.18 2013/04/06 06:00:22 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.19 2013/04/22 07:23:08 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=/tmp/openssh.regress.ctl-sock.$$ 4CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -25,10 +25,16 @@ wait_for_mux_master_ready()
25 25
26start_sshd 26start_sshd
27 27
28trace "start master, fork to background" 28start_mux_master()
29${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & 29{
30MASTER_PID=$! 30 trace "start master, fork to background"
31wait_for_mux_master_ready 31 ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost \
32 -E $TEST_REGRESS_LOGFILE 2>&1 &
33 MASTER_PID=$!
34 wait_for_mux_master_ready
35}
36
37start_mux_master
32 38
33verbose "test $tid: envpass" 39verbose "test $tid: envpass"
34trace "env passing over multiplexed connection" 40trace "env passing over multiplexed connection"
@@ -101,9 +107,7 @@ kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"
101# Restart master and test -O stop command with master using -N 107# Restart master and test -O stop command with master using -N
102verbose "test $tid: cmd stop" 108verbose "test $tid: cmd stop"
103trace "restart master, fork to background" 109trace "restart master, fork to background"
104${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & 110start_mux_master
105MASTER_PID=$!
106wait_for_mux_master_ready
107 111
108# start a long-running command then immediately request a stop 112# start a long-running command then immediately request a stop
109${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \ 113${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \