summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-17 09:01:21 +0200
committerDarren Tucker <dtucker@zip.com.au>2004-06-17 09:01:21 +0200
commita9972e19e941f9f711103b50dd57f6bc0c1aad53 (patch)
tree565f69afda14bff0f69ba1ee18224f8c0c7fdc3e
parent - (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need (diff)
downloadopenssh-a9972e19e941f9f711103b50dd57f6bc0c1aad53.tar.xz
openssh-a9972e19e941f9f711103b50dd57f6bc0c1aad53.zip
- (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not
enough for slow systems, especially if they don't have a kernel RNG).
-rw-r--r--ChangeLog4
-rw-r--r--regress/multiplex.sh2
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 04086429e..95b583e3c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,8 @@
Add small description of failing test to failure message; ok djm@
- (dtucker) [regress/multiplex.sh] add EXEEXT for those platforms that need
it.
+ - (dtucker) [regress/multiplex.sh] Increase sleep time to 120 sec (60 is not
+ enough for slow systems, especially if they don't have a kernel RNG).
20040616
- (dtucker) [openbsd-compat/port-aix.c] Expand whitespace -> tabs. No
@@ -1268,4 +1270,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3403 2004/06/17 06:36:27 dtucker Exp $
+$Id: ChangeLog,v 1.3404 2004/06/17 07:01:21 dtucker Exp $
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 654aae5e6..8605d5e0b 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -11,7 +11,7 @@ COPY=$OBJ/ls.copy
start_sshd
trace "start master, fork to background"
-${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 60
+${SSH} -2 -MS$CTL -F $OBJ/ssh_config -f somehost sleep 120
rm -f ${COPY}
trace "ssh transfer over multiplexed connection and check result"