- dtucker@cvs.openbsd.org 2013/05/17 04:29:14

[regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh regress/multiplex.sh] Move the setting of DATA and COPY into test-exec.sh
2013-05-17 15:32:29 +10:00 · 2013-05-17 15:32:29 +10:00 · 59d928d3b4
parent 34035be27b
commit 59d928d3b4
23 changed files with 47 additions and 85 deletions
--- a/10
+++ b/10
@ -58,6 +58,16 @@
   - dtucker@cvs.openbsd.org 2013/05/17 01:32:11
     [regress/integrity.sh]
     don't print output from ssh before getting it (it's available in ssh.log)
+   - dtucker@cvs.openbsd.org 2013/05/17 04:29:14
+     [regress/sftp.sh regress/putty-ciphers.sh regress/cipher-speed.sh
+     regress/test-exec.sh regress/sftp-batch.sh regress/dynamic-forward.sh
+     regress/putty-transfer.sh regress/conch-ciphers.sh regress/sftp-cmds.sh
+     regress/scp.sh regress/ssh-com-sftp.sh regress/rekey.sh
+     regress/putty-kex.sh regress/stderr-data.sh regress/stderr-after-eof.sh
+     regress/sftp-badcmds.sh regress/reexec.sh regress/ssh-com-client.sh
+     regress/sftp-chroot.sh regress/forwarding.sh regress/transfer.sh
+     regress/multiplex.sh]
+     Move the setting of DATA and COPY into test-exec.sh
 - (dtucker) [regress/bsd.regress.mk] Remove unused file.  We've never used it
   in portable and it's long gone in openbsd.
 - (dtucker) [regress/integrity.sh].  Force fixed Diffie-Hellman key exchange
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: cipher-speed.sh,v 1.8 2013/05/17 00:37:40 dtucker Exp $
+#	$OpenBSD: cipher-speed.sh,v 1.9 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="cipher speed"
--- a/regress/conch-ciphers.sh
+++ b/regress/conch-ciphers.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: conch-ciphers.sh,v 1.2 2008/06/30 10:43:03 djm Exp $
+#	$OpenBSD: conch-ciphers.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="conch ciphers"

-DATA=/bin/ls
-COPY=${OBJ}/copy
-
 if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
 	echo "conch interop tests not enabled"
 	exit 0
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@ -1,12 +1,10 @@
-#	$OpenBSD: dynamic-forward.sh,v 1.9 2011/06/03 00:29:52 dtucker Exp $
+#	$OpenBSD: dynamic-forward.sh,v 1.10 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="dynamic forwarding"

 FWDPORT=`expr $PORT + 1`

-DATA=/bin/ls${EXEEXT}
-
 if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
 	proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
 elif have_prog connect; then
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@ -1,8 +1,7 @@
-#	$OpenBSD: forwarding.sh,v 1.9 2013/04/07 02:16:03 dtucker Exp $
+#	$OpenBSD: forwarding.sh,v 1.10 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="local and remote forwarding"
-DATA=/bin/ls${EXEEXT}

 start_sshd

@ -26,9 +25,9 @@ for p in 1 2; do

 	trace "transfer over forwarded channels and check result"
 	${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
-		somehost cat $DATA > $OBJ/ls.copy
-	test -f $OBJ/ls.copy			|| fail "failed copy $DATA"
-	cmp $DATA $OBJ/ls.copy			|| fail "corrupted copy of $DATA"
+		somehost cat ${DATA} > ${COPY}
+	test -f ${COPY}		|| fail "failed copy of ${DATA}"
+	cmp ${DATA} ${COPY}	|| fail "corrupted copy of ${DATA}"

 	sleep 10
 done
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: multiplex.sh,v 1.20 2013/04/22 07:28:53 dtucker Exp $
+#	$OpenBSD: multiplex.sh,v 1.21 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 CTL=/tmp/openssh.regress.ctl-sock.$$
@ -10,8 +10,6 @@ if config_defined DISABLE_FD_PASSING ; then
 	exit 0
 fi

-DATA=/bin/ls${EXEEXT}
-COPY=$OBJ/ls.copy
 P=3301  # test port

 wait_for_mux_master_ready()
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: putty-ciphers.sh,v 1.3 2008/11/10 02:06:35 djm Exp $
+#	$OpenBSD: putty-ciphers.sh,v 1.4 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="putty ciphers"

-DATA=/bin/ls
-COPY=${OBJ}/copy
-
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
 	echo "putty interop tests not enabled"
 	exit 0
--- a/regress/putty-kex.sh
+++ b/regress/putty-kex.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: putty-kex.sh,v 1.2 2008/06/30 10:31:11 djm Exp $
+#	$OpenBSD: putty-kex.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="putty KEX"

-DATA=/bin/ls
-COPY=${OBJ}/copy
-
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
 	echo "putty interop tests not enabled"
 	exit 0
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: putty-transfer.sh,v 1.2 2008/06/30 10:31:11 djm Exp $
+#	$OpenBSD: putty-transfer.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="putty transfer data"

-DATA=/bin/ls
-COPY=${OBJ}/copy
-
 if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
 	echo "putty interop tests not enabled"
 	exit 0
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@ -1,12 +1,10 @@
-#	$OpenBSD: reexec.sh,v 1.5 2004/10/08 02:01:50 djm Exp $
+#	$OpenBSD: reexec.sh,v 1.6 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="reexec tests"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-SSHD_ORIG=$SSHD${EXEEXT}
-SSHD_COPY=$OBJ/sshd${EXEEXT}
+SSHD_ORIG=$SSHD
+SSHD_COPY=$OBJ/sshd

 # Start a sshd and then delete it
 start_sshd_copy ()
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@ -1,15 +1,11 @@
-#	$OpenBSD: rekey.sh,v 1.7 2013/05/16 05:48:31 dtucker Exp $
+#	$OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="rekey"

-DATA=${OBJ}/data
-COPY=${OBJ}/copy
 LOG=${TEST_SSH_LOGFILE}

-rm -f ${COPY} ${LOG} ${DATA}
-touch ${DATA}
-dd if=/bin/ls${EXEEXT} of=${DATA} bs=1k seek=511 count=1 > /dev/null 2>&1
+rm -f ${LOG}

 for s in 16 1k 128k 256k; do
 	verbose "client rekeylimit ${s}"
--- a/regress/scp.sh
+++ b/regress/scp.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: scp.sh,v 1.7 2006/01/31 10:36:33 djm Exp $
+#	$OpenBSD: scp.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="scp"
@ -12,8 +12,6 @@ else
 	DIFFOPT="-r"
 fi

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
 COPY2=${OBJ}/copy2
 DIR=${COPY}.dd
 DIR2=${COPY}.dd2
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@ -1,12 +1,10 @@
-#	$OpenBSD: sftp-badcmds.sh,v 1.4 2009/08/13 01:11:55 djm Exp $
+#	$OpenBSD: sftp-badcmds.sh,v 1.5 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="sftp invalid commands"

-DATA=/bin/ls${EXEEXT}
 DATA2=/bin/sh${EXEEXT}
 NONEXIST=/NONEXIST.$$
-COPY=${OBJ}/copy
 GLOBFILES=`(cd /bin;echo l*)`

 rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
--- a/regress/sftp-batch.sh
+++ b/regress/sftp-batch.sh
@ -1,10 +1,8 @@
-#	$OpenBSD: sftp-batch.sh,v 1.4 2009/08/13 01:11:55 djm Exp $
+#	$OpenBSD: sftp-batch.sh,v 1.5 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="sftp batchfile"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
 BATCH=${OBJ}/sftp.bb

 rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
--- a/regress/sftp-chroot.sh
+++ b/regress/sftp-chroot.sh
@ -1,9 +1,8 @@
-#	$OpenBSD: sftp-chroot.sh,v 1.1 2013/04/18 02:46:12 djm Exp $
+#	$OpenBSD: sftp-chroot.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="sftp in chroot"

-COPY=${OBJ}/copy
 CHROOT=/var/run
 FILENAME=testdata_${USER}
 PRIVDATA=${CHROOT}/${FILENAME}
@ -18,7 +17,6 @@ $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \
 start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /"

 verbose "test $tid: get"
-rm -f ${COPY}
 ${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \
 	fatal "Fetch ${FILENAME} failed"
 cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ"
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $
+#	$OpenBSD: sftp-cmds.sh,v 1.13 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 # XXX - TODO: 
@ -7,8 +7,6 @@

 tid="sftp commands"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
 # test that these files are readable!
 for i in `(cd /bin;echo l*)`
 do
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: sftp.sh,v 1.3 2009/08/13 01:11:55 djm Exp $
+#	$OpenBSD: sftp.sh,v 1.4 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="basic sftp put/get"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-
 SFTPCMDFILE=${OBJ}/batch
 cat >$SFTPCMDFILE <<EOF
 version
--- a/regress/ssh-com-client.sh
+++ b/regress/ssh-com-client.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: ssh-com-client.sh,v 1.6 2004/02/24 17:06:52 markus Exp $
+#	$OpenBSD: ssh-com-client.sh,v 1.7 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="connect with ssh.com client"
@ -67,10 +67,6 @@ EOF
 # we need a real server (no ProxyConnect option)
 start_sshd

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-rm -f ${COPY}
-
 # go for it
 for v in ${VERSIONS}; do
 	ssh2=${TEST_COMBASE}/${v}/ssh2
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@ -1,10 +1,8 @@
-#	$OpenBSD: ssh-com-sftp.sh,v 1.6 2009/08/20 18:43:07 djm Exp $
+#	$OpenBSD: ssh-com-sftp.sh,v 1.7 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="basic sftp put/get with ssh.com server"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
 SFTPCMDFILE=${OBJ}/batch

 cat >$SFTPCMDFILE <<EOF
--- a/regress/stderr-after-eof.sh
+++ b/regress/stderr-after-eof.sh
@ -1,12 +1,8 @@
-#	$OpenBSD: stderr-after-eof.sh,v 1.1 2002/03/23 16:38:09 markus Exp $
+#	$OpenBSD: stderr-after-eof.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="stderr data after eof"

-DATA=/etc/motd
-DATA=${OBJ}/data
-COPY=${OBJ}/copy
-
 if have_prog md5sum; then
 	CHECKSUM=md5sum
 elif have_prog openssl; then
--- a/regress/stderr-data.sh
+++ b/regress/stderr-data.sh
@ -1,12 +1,8 @@
-#	$OpenBSD: stderr-data.sh,v 1.2 2002/03/27 22:39:52 markus Exp $
+#	$OpenBSD: stderr-data.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="stderr data transfer"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-rm -f ${COPY}
-
 for n in '' -n; do
 for p in 1 2; do
 	verbose "test $tid: proto $p ($n)"
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.41 2013/05/17 00:37:40 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.42 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 #SUDO=sudo
@ -155,10 +155,6 @@ fi
 >$TEST_SSHD_LOGFILE
 >$TEST_REGRESS_LOGFILE

-# Some data for test copies
-DATA=$OBJ/testdata
-cat $SSHD${EXEEXT} $SSHD${EXEEXT} $SSHD${EXEEXT} $SSHD${EXEEXT} >$DATA
-
 # Create wrapper ssh with logging.  We can't just specify "SSH=ssh -E..."
 # because sftp and scp don't handle spaces in arguments.
 SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
@ -168,6 +164,15 @@ echo "exec ${SSH} -E${TEST_SSH_LOGFILE} "'"$@"' >>$SSHLOGWRAP
 chmod a+rx $OBJ/ssh-log-wrapper.sh
 SSH="$SSHLOGWRAP"

+# Some test data.  We make a copy because some tests will overwrite it.
+# The tests may assume that $DATA exists and is writable and $COPY does
+# not exist.
+DATA=$OBJ/data
+cat $SSHD $SSHD $SSHD $SSHD >${DATA}
+chmod u+w ${DATA}
+COPY=$OBJ/copy
+rm -f ${COPY}
+
 # 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
--- a/regress/transfer.sh
+++ b/regress/transfer.sh
@ -1,11 +1,8 @@
-#	$OpenBSD: transfer.sh,v 1.1 2002/03/27 00:03:37 markus Exp $
+#	$OpenBSD: transfer.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
 #	Placed in the Public Domain.

 tid="transfer data"

-DATA=/bin/ls${EXEEXT}
-COPY=${OBJ}/copy
-
 for p in 1 2; do
 	verbose "$tid: proto $p"
 	rm -f ${COPY}