RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-28 11:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

- dtucker@cvs.openbsd.org 2013/04/22 07:23:08

Browse Source 
[multiplex.sh]
     Write mux master logs to regress.log instead of ssh.log to keep separate
This commit is contained in:
Darren Tucker 2013-05-17 09:36:20 +10:00
parent f3568fc62b
commit 40aaff7e4b
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -22,8 +22,11 @@
from ssh and sshd for the failing tests (and only the failing tests) should from ssh and sshd for the failing tests (and only the failing tests) should
be available in failed-ssh{,d}.log. be available in failed-ssh{,d}.log.
- djm@cvs.openbsd.org 2013/04/18 02:46:12 - djm@cvs.openbsd.org 2013/04/18 02:46:12
[Makefile regress/sftp-chroot.sh] [regress/Makefile regress/sftp-chroot.sh]
test sshd ChrootDirectory+internal-sftp; feedback & ok dtucker@ test sshd ChrootDirectory+internal-sftp; feedback & ok dtucker@
- dtucker@cvs.openbsd.org 2013/04/22 07:23:08
[multiplex.sh]
Write mux master logs to regress.log instead of ssh.log to keep separate
20130516 20130516
- (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be

14
regress/multiplex.sh
View File

@ -1,4 +1,4 @@
# $OpenBSD: multiplex.sh,v 1.18 2013/04/06 06:00:22 dtucker Exp $ # $OpenBSD: multiplex.sh,v 1.19 2013/04/22 07:23:08 dtucker Exp $
# Placed in the Public Domain. # Placed in the Public Domain.
CTL=/tmp/openssh.regress.ctl-sock.$$ CTL=/tmp/openssh.regress.ctl-sock.$$
@ -25,10 +25,16 @@ wait_for_mux_master_ready()
start_sshd start_sshd
start_mux_master()
{
trace "start master, fork to background" trace "start master, fork to background"
${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & ${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost \
-E $TEST_REGRESS_LOGFILE 2>&1 &
MASTER_PID=$! MASTER_PID=$!
wait_for_mux_master_ready wait_for_mux_master_ready
}
start_mux_master
verbose "test $tid: envpass" verbose "test $tid: envpass"
trace "env passing over multiplexed connection" trace "env passing over multiplexed connection"
@ -101,9 +107,7 @@ kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"
# Restart master and test -O stop command with master using -N # Restart master and test -O stop command with master using -N
verbose "test $tid: cmd stop" verbose "test $tid: cmd stop"
trace "restart master, fork to background" trace "restart master, fork to background"
${SSH} -Nn2 -MS$CTL -F $OBJ/ssh_config -oSendEnv="_XXX_TEST" somehost & start_mux_master
MASTER_PID=$!
wait_for_mux_master_ready
# start a long-running command then immediately request a stop # start a long-running command then immediately request a stop
${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \ ${SSH} -F $OBJ/ssh_config -S $CTL otherhost "sleep 10; exit 0" \