From 977a9d21c885d9da6f6ac3c8d16f70765b0934ce Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 25 Jun 2004 13:45:18 +1000
Subject:    - djm@cvs.openbsd.org 2004/06/24 19:32:00      [regress/Makefile
 regress/test-exec.sh, added regress/reexec.sh]      regress test for re-exec
 corner cases

---
 regress/test-exec.sh | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

(limited to 'regress/test-exec.sh')

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index b0ac64e9e..e626dd78a 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.20 2004/06/22 22:45:52 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.22 2004/06/24 19:32:00 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -82,6 +82,9 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then
 	SCP="${TEST_SSH_SCP}"
 fi
 
+# Path to sshd must be absolute for rexec
+SSHD=`which sshd`
+
 # these should be used in tests
 export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
 #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
@@ -265,6 +268,27 @@ start_sshd ()
 	test -f $PIDFILE || fatal "no sshd running on port $PORT"
 }
 
+# Start a sshd and then delete it
+start_sshd_copy_zap ()
+{
+	cp ${SSHD} $OBJ/sshd.copy
+	SSHD_CPY=`which $OBJ/sshd.copy`
+
+	# start sshd
+	$SUDO $SSHD_CPY -f $OBJ/sshd_config -t	|| fatal "sshd_config broken"
+	$SUDO $SSHD_CPY -f $OBJ/sshd_config
+
+	trace "wait for sshd"
+	i=0;
+	while [ ! -f $PIDFILE -a $i -lt 5 ]; do
+		i=`expr $i + 1`
+		sleep $i
+	done
+
+	test -f $PIDFILE || fatal "no sshd running on port $PORT"
+	rm -f $OBJ/sshd.copy
+}
+
 # source test body
 . $SCRIPT
 
-- 
cgit v1.2.3