diff options
author | Damien Miller <djm@mindrot.org> | 2012-12-03 10:06:37 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2012-12-03 10:06:37 +1100 |
commit | d27a026ab7599a95d96436274c3033c2157cdd85 (patch) | |
tree | 78d9952e51b9c4394f1f50ae2d9dd99143e308df /regress/multiplex.sh | |
parent | 15b05cfa17592da7470d7bd4b2de063188697471 (diff) |
- dtucker@cvs.openbsd.org 2012/10/05 02:05:30
[regress/multiplex.sh]
Use 'kill -0' to test for the presence of a pid since it's more portable
Diffstat (limited to 'regress/multiplex.sh')
-rw-r--r-- | regress/multiplex.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/regress/multiplex.sh b/regress/multiplex.sh index f93ac9a41..1e6cc7606 100644 --- a/regress/multiplex.sh +++ b/regress/multiplex.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: multiplex.sh,v 1.16 2012/09/10 01:51:19 dtucker Exp $ | 1 | # $OpenBSD: multiplex.sh,v 1.17 2012/10/05 02:05:30 dtucker Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | CTL=/tmp/openssh.regress.ctl-sock.$$ | 4 | CTL=/tmp/openssh.regress.ctl-sock.$$ |
@@ -96,7 +96,7 @@ ${SSH} -F $OBJ/ssh_config -S $CTL -Oexit otherhost >>$TEST_SSH_LOGFILE 2>&1 \ | |||
96 | 96 | ||
97 | # Wait for master to exit | 97 | # Wait for master to exit |
98 | wait $MASTER_PID | 98 | wait $MASTER_PID |
99 | kill -0 $MASTER_PID >/dev/null && fail "exit command failed" | 99 | kill -0 $MASTER_PID >/dev/null 2>&1 && fail "exit command failed" |
100 | 100 | ||
101 | # Restart master and test -O stop command with master using -N | 101 | # Restart master and test -O stop command with master using -N |
102 | verbose "test $tid: cmd stop" | 102 | verbose "test $tid: cmd stop" |
@@ -117,4 +117,4 @@ wait $SLEEP_PID | |||
117 | [ $! != 0 ] || fail "waiting for concurrent command" | 117 | [ $! != 0 ] || fail "waiting for concurrent command" |
118 | wait $MASTER_PID | 118 | wait $MASTER_PID |
119 | [ $! != 0 ] || fail "waiting for master stop" | 119 | [ $! != 0 ] || fail "waiting for master stop" |
120 | kill -0 $MASTER_PID >/dev/null && fail "stop command failed" | 120 | kill -0 $MASTER_PID >/dev/null 2>&1 && fail "stop command failed" |