diff options
| author | Darren Tucker <dtucker@cvs.openbsd.org> | 2013-05-17 10:30:08 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@cvs.openbsd.org> | 2013-05-17 10:30:08 +0000 |
| commit | 6874480cb6777cdba932c5cc3420bf683e9aa267 (patch) | |
| tree | c952dd1a60829d2e1798a29080746c86cb4e67bb /regress/usr.bin | |
| parent | 530f16f71a9746235782ffb6abde2e4c64fc7ac5 (diff) | |
wait a bit longer for startup and use case for absolute path. from portable
Diffstat (limited to 'regress/usr.bin')
| -rw-r--r-- | regress/usr.bin/ssh/test-exec.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/regress/usr.bin/ssh/test-exec.sh b/regress/usr.bin/ssh/test-exec.sh index 3ff9a50a91d..d0862dae8e9 100644 --- a/regress/usr.bin/ssh/test-exec.sh +++ b/regress/usr.bin/ssh/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.43 2013/05/17 10:23:52 dtucker Exp $ +# $OpenBSD: test-exec.sh,v 1.44 2013/05/17 10:30:07 dtucker Exp $ # Placed in the Public Domain. USER=`id -un` @@ -92,9 +92,10 @@ if [ "x$TEST_SSH_CONCH" != "x" ]; then fi # Path to sshd must be absolute for rexec -if [ ! -x /$SSHD ]; then - SSHD=`which sshd` -fi +case "$SSHD" in +/*) ;; +*) SSHD=`which sshd` ;; +esac # Logfiles. # SSH_LOGFILE should be the debug output of ssh(1) only @@ -360,7 +361,7 @@ start_sshd () trace "wait for sshd" i=0; - while [ ! -f $PIDFILE -a $i -lt 5 ]; do + while [ ! -f $PIDFILE -a $i -lt 10 ]; do i=`expr $i + 1` sleep $i done |