From 54343e95c70994695f8842fb22836321350198d3 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Thu, 15 May 2014 15:07:33 +1000 Subject: - djm@cvs.openbsd.org 2014/03/13 20:44:49 [login-timeout.sh] this test is a sorry mess of race conditions; add another sleep to avoid a failure on slow machines (at least until I find a better way) --- ChangeLog | 6 ++++++ regress/login-timeout.sh | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 976e4ba1f..00104524a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -91,6 +91,12 @@ portability glue to support building without libcrypto - (djm) [Makefile.in configure.ac sshbuf-getput-basic.c] [sshbuf-getput-crypto.c sshbuf.c] compilation and portability fixes + - OpenBSD CVS Sync + - djm@cvs.openbsd.org 2014/03/13 20:44:49 + [login-timeout.sh] + this test is a sorry mess of race conditions; add another sleep + to avoid a failure on slow machines (at least until I find a + better way) 20140430 - (dtucker) [defines.h] Define __GNUC_PREREQ__ macro if we don't already diff --git a/regress/login-timeout.sh b/regress/login-timeout.sh index d9b48f391..eb76f554b 100644 --- a/regress/login-timeout.sh +++ b/regress/login-timeout.sh @@ -1,4 +1,4 @@ -# $OpenBSD: login-timeout.sh,v 1.6 2014/02/27 20:04:16 djm Exp $ +# $OpenBSD: login-timeout.sh,v 1.7 2014/03/13 20:44:49 djm Exp $ # Placed in the Public Domain. tid="connect after login grace timeout" @@ -22,6 +22,7 @@ $SUDO kill `$SUDO cat $PIDFILE` trace "test login grace without privsep" echo "UsePrivilegeSeparation no" >> $OBJ/sshd_config start_sshd +sleep 1 (echo SSH-2.0-fake; sleep 60) | telnet 127.0.0.1 ${PORT} >/dev/null 2>&1 & sleep 15 -- cgit v1.2.3