From e23a79cbed41a3d10533a9d5caefdcee058a066b Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Mon, 12 Oct 2009 09:37:22 +1100 Subject: - markus@cvs.openbsd.org 2009/10/08 18:04:27 [regress/test-exec.sh] re-enable protocol v1 for the tests. --- regress/test-exec.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'regress/test-exec.sh') diff --git a/regress/test-exec.sh b/regress/test-exec.sh index b54448912..804a29696 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.35 2008/06/28 13:57:25 djm Exp $ +# $OpenBSD: test-exec.sh,v 1.36 2009/10/08 18:04:27 markus Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -222,6 +222,7 @@ trap fatal 3 2 cat << EOF > $OBJ/sshd_config StrictModes no Port $PORT + Protocol 2,1 AddressFamily inet ListenAddress 127.0.0.1 #ListenAddress ::1 @@ -247,6 +248,7 @@ echo 'StrictModes no' >> $OBJ/sshd_proxy # create client config cat << EOF > $OBJ/ssh_config Host * + Protocol 2,1 Hostname 127.0.0.1 HostKeyAlias localhost-with-alias Port $PORT -- cgit v1.2.3 From c1739211a6ce790e72262db90ba4b1d0ce79d1f4 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 24 Feb 2010 17:29:34 +1100 Subject: - djm@cvs.openbsd.org 2010/02/24 06:21:56 [regress/test-exec.sh] wait for sshd to fully stop in cleanup() function; avoids races in tests that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@ --- ChangeLog | 4 ++++ regress/test-exec.sh | 12 ++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'regress/test-exec.sh') diff --git a/ChangeLog b/ChangeLog index 5595fdbbc..5c637af17 100644 --- a/ChangeLog +++ b/ChangeLog @@ -18,6 +18,10 @@ [regress/Makefile] turn on all the malloc(3) checking options when running regression tests. this has caught a few bugs for me in the past; ok dtucker@ + - djm@cvs.openbsd.org 2010/02/24 06:21:56 + [regress/test-exec.sh] + wait for sshd to fully stop in cleanup() function; avoids races in tests + that do multiple start_sshd/cleanup cycles; "I hate pidfiles" deraadt@ 20100212 - (djm) OpenBSD CVS Sync diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 804a29696..b3a19389d 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -1,4 +1,4 @@ -# $OpenBSD: test-exec.sh,v 1.36 2009/10/08 18:04:27 markus Exp $ +# $OpenBSD: test-exec.sh,v 1.37 2010/02/24 06:21:56 djm Exp $ # Placed in the Public Domain. #SUDO=sudo @@ -172,9 +172,17 @@ cleanup () echo no sshd running else if [ $pid -lt 2 ]; then - echo bad pid for ssd: $pid + echo bad pid for ssh: $pid else $SUDO kill $pid + trace "wait for sshd to exit" + i=0; + while [ -f $PIDFILE -a $i -lt 5 ]; do + i=`expr $i + 1` + sleep $i + done + test -f $PIDFILE && \ + fatal "sshd didn't exit port $PORT pid $pid" fi fi fi -- cgit v1.2.3