summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-04-25 14:49:48 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-04-25 14:49:48 +1000
commitbf2b3983277c88ecef8bd50eab9a2b5e103d4b38 (patch)
tree4f6459e838e31c85385abbc43b6d51ef3fed1bdb
parentfaefd2e73d242a1bb482a81a33e3b7434aa72733 (diff)
- (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh
will clean up anyway. From tim@
-rw-r--r--ChangeLog4
-rw-r--r--regress/multiplex.sh2
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 547f0f5b1..2f1b62a1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
2 - (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the 2 - (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the
3 existence of a process since it's more portable. Found by jbasney at 3 existence of a process since it's more portable. Found by jbasney at
4 ncsa.uiuc.edu; ok tim@ 4 ncsa.uiuc.edu; ok tim@
5 - (dtucker) [regress/multiplex.sh] Remove cleanup call since test-exec.sh
6 will clean up anyway. From tim@
5 7
620050424 820050424
7 - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or 9 - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or
@@ -2457,4 +2459,4 @@
2457 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2459 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2458 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2460 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2459 2461
2460$Id: ChangeLog,v 1.3748 2005/04/25 04:48:22 dtucker Exp $ 2462$Id: ChangeLog,v 1.3749 2005/04/25 04:49:48 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 63a5c6238..b346b096e 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -90,5 +90,3 @@ ${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed"
90sleep 2 90sleep 2
91 91
92kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed" 92kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"
93
94cleanup