summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2005-04-25 14:48:22 +1000
committerDarren Tucker <dtucker@zip.com.au>2005-04-25 14:48:22 +1000
commitfaefd2e73d242a1bb482a81a33e3b7434aa72733 (patch)
tree333c6df2269b4478276a67525d39cfcd1dc7c1ad
parent2f0b5c4869bab45bccb8472590bbd3edb44c092a (diff)
- (dtucker) [regress/multiplex.sh] Use "kill -0 $pid" to check for the
existence of a process since it's more portable. Found by jbasney at ncsa.uiuc.edu; ok tim@
-rw-r--r--ChangeLog7
-rw-r--r--regress/multiplex.sh2
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d2d2f347f..547f0f5b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120050425
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
4 ncsa.uiuc.edu; ok tim@
5
120050424 620050424
2 - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or 7 - (dtucker) [INSTALL configure.ac] Make zlib version check test for 1.1.4 or
3 1.2.1.2 or higher. With tim@, ok djm@ 8 1.2.1.2 or higher. With tim@, ok djm@
@@ -2452,4 +2457,4 @@
2452 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 2457 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
2453 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 2458 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
2454 2459
2455$Id: ChangeLog,v 1.3747 2005/04/24 07:52:22 dtucker Exp $ 2460$Id: ChangeLog,v 1.3748 2005/04/25 04:48:22 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index e8cc1ac53..63a5c6238 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -89,6 +89,6 @@ ${SSH} -S $CTL -Oexit otherhost || fail "send exit command failed"
89# Wait for master to exit 89# Wait for master to exit
90sleep 2 90sleep 2
91 91
92ps -p $MASTER_PID >/dev/null && fail "exit command failed" 92kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed"
93 93
94cleanup 94cleanup