diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2011-06-03 14:18:17 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2011-06-03 14:18:17 +1000 |
| commit | 75e035c34e323cccb19aab5d58cb9c706ce8fcee (patch) | |
| tree | eec18a40d361946ba81b6d74146188a3bec12573 | |
| parent | 260c8fbc4d8c5865fc312ed56a48b36817507b30 (diff) | |
- dtucker@cvs.openbsd.org 2011/05/31 02:03:34
[regress/dynamic-forward.sh]
work around startup and teardown races; caught by deraadt
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/dynamic-forward.sh | 6 |
2 files changed, 7 insertions, 2 deletions
@@ -26,6 +26,9 @@ - dtucker@cvs.openbsd.org 2011/05/31 02:01:58 [regress/dynamic-forward.sh] back out revs 1.6 and 1.5 since it's not reliable + - dtucker@cvs.openbsd.org 2011/05/31 02:03:34 + [regress/dynamic-forward.sh] + work around startup and teardown races; caught by deraadt 20110529 - (djm) OpenBSD CVS Sync diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh index 0a862b50..39b58c81 100644 --- a/regress/dynamic-forward.sh +++ b/regress/dynamic-forward.sh @@ -1,4 +1,4 @@ -# $OpenBSD: dynamic-forward.sh,v 1.7 2011/05/31 02:01:58 dtucker Exp $ +# $OpenBSD: dynamic-forward.sh,v 1.8 2011/05/31 02:03:34 dtucker Exp $ # Placed in the Public Domain. tid="dynamic forwarding" @@ -21,7 +21,8 @@ start_sshd for p in 1 2; do trace "start dynamic forwarding, fork to background" - ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q somehost \ + ${SSH} -$p -F $OBJ/ssh_config -f -D $FWDPORT -q \ + -oExitOnForwardFailure=yes somehost \ exec sh -c \'"echo \$\$ > $OBJ/remote_pid; exec sleep 444"\' for s in 4 5; do @@ -41,6 +42,7 @@ for p in 1 2; do if [ $remote -gt 1 ]; then kill -HUP $remote fi + sleep 1 else fail "no pid file: $OBJ/remote_pid" fi |