summaryrefslogtreecommitdiff
path: root/regress
diff options
context:
space:
mode:
Diffstat (limited to 'regress')
-rw-r--r--regress/cipher-speed.sh2
-rw-r--r--regress/conch-ciphers.sh5
-rw-r--r--regress/dynamic-forward.sh4
-rw-r--r--regress/forwarding.sh9
-rw-r--r--regress/multiplex.sh4
-rw-r--r--regress/putty-ciphers.sh5
-rw-r--r--regress/putty-kex.sh5
-rw-r--r--regress/putty-transfer.sh5
-rw-r--r--regress/reexec.sh8
-rw-r--r--regress/rekey.sh8
-rw-r--r--regress/scp.sh4
-rw-r--r--regress/sftp-badcmds.sh4
-rw-r--r--regress/sftp-batch.sh4
-rw-r--r--regress/sftp-chroot.sh4
-rw-r--r--regress/sftp-cmds.sh4
-rw-r--r--regress/sftp.sh5
-rw-r--r--regress/ssh-com-client.sh6
-rw-r--r--regress/ssh-com-sftp.sh4
-rw-r--r--regress/stderr-after-eof.sh6
-rw-r--r--regress/stderr-data.sh6
-rw-r--r--regress/test-exec.sh15
-rw-r--r--regress/transfer.sh5
22 files changed, 37 insertions, 85 deletions
diff --git a/regress/cipher-speed.sh b/regress/cipher-speed.sh
index 07daebe62..489d9f5fa 100644
--- a/regress/cipher-speed.sh
+++ b/regress/cipher-speed.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: cipher-speed.sh,v 1.8 2013/05/17 00:37:40 dtucker Exp $ 1# $OpenBSD: cipher-speed.sh,v 1.9 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="cipher speed" 4tid="cipher speed"
diff --git a/regress/conch-ciphers.sh b/regress/conch-ciphers.sh
index 5b65cd993..199d863a0 100644
--- a/regress/conch-ciphers.sh
+++ b/regress/conch-ciphers.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: conch-ciphers.sh,v 1.2 2008/06/30 10:43:03 djm Exp $ 1# $OpenBSD: conch-ciphers.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="conch ciphers" 4tid="conch ciphers"
5 5
6DATA=/bin/ls
7COPY=${OBJ}/copy
8
9if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then 6if test "x$REGRESS_INTEROP_CONCH" != "xyes" ; then
10 echo "conch interop tests not enabled" 7 echo "conch interop tests not enabled"
11 exit 0 8 exit 0
diff --git a/regress/dynamic-forward.sh b/regress/dynamic-forward.sh
index d1ab8059b..42fa8acdc 100644
--- a/regress/dynamic-forward.sh
+++ b/regress/dynamic-forward.sh
@@ -1,12 +1,10 @@
1# $OpenBSD: dynamic-forward.sh,v 1.9 2011/06/03 00:29:52 dtucker Exp $ 1# $OpenBSD: dynamic-forward.sh,v 1.10 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="dynamic forwarding" 4tid="dynamic forwarding"
5 5
6FWDPORT=`expr $PORT + 1` 6FWDPORT=`expr $PORT + 1`
7 7
8DATA=/bin/ls${EXEEXT}
9
10if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then 8if have_prog nc && nc -h 2>&1 | grep "proxy address" >/dev/null; then
11 proxycmd="nc -x 127.0.0.1:$FWDPORT -X" 9 proxycmd="nc -x 127.0.0.1:$FWDPORT -X"
12elif have_prog connect; then 10elif have_prog connect; then
diff --git a/regress/forwarding.sh b/regress/forwarding.sh
index 6a7003070..2ba140fee 100644
--- a/regress/forwarding.sh
+++ b/regress/forwarding.sh
@@ -1,8 +1,7 @@
1# $OpenBSD: forwarding.sh,v 1.9 2013/04/07 02:16:03 dtucker Exp $ 1# $OpenBSD: forwarding.sh,v 1.10 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="local and remote forwarding" 4tid="local and remote forwarding"
5DATA=/bin/ls${EXEEXT}
6 5
7start_sshd 6start_sshd
8 7
@@ -26,9 +25,9 @@ for p in 1 2; do
26 25
27 trace "transfer over forwarded channels and check result" 26 trace "transfer over forwarded channels and check result"
28 ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \ 27 ${SSH} -$q -F $OBJ/ssh_config -p$last -o 'ConnectionAttempts=4' \
29 somehost cat $DATA > $OBJ/ls.copy 28 somehost cat ${DATA} > ${COPY}
30 test -f $OBJ/ls.copy || fail "failed copy $DATA" 29 test -f ${COPY} || fail "failed copy of ${DATA}"
31 cmp $DATA $OBJ/ls.copy || fail "corrupted copy of $DATA" 30 cmp ${DATA} ${COPY} || fail "corrupted copy of ${DATA}"
32 31
33 sleep 10 32 sleep 10
34done 33done
diff --git a/regress/multiplex.sh b/regress/multiplex.sh
index 8389b3840..3e697e691 100644
--- a/regress/multiplex.sh
+++ b/regress/multiplex.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: multiplex.sh,v 1.20 2013/04/22 07:28:53 dtucker Exp $ 1# $OpenBSD: multiplex.sh,v 1.21 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4CTL=/tmp/openssh.regress.ctl-sock.$$ 4CTL=/tmp/openssh.regress.ctl-sock.$$
@@ -10,8 +10,6 @@ if config_defined DISABLE_FD_PASSING ; then
10 exit 0 10 exit 0
11fi 11fi
12 12
13DATA=/bin/ls${EXEEXT}
14COPY=$OBJ/ls.copy
15P=3301 # test port 13P=3301 # test port
16 14
17wait_for_mux_master_ready() 15wait_for_mux_master_ready()
diff --git a/regress/putty-ciphers.sh b/regress/putty-ciphers.sh
index 928ea60d2..724a98cc1 100644
--- a/regress/putty-ciphers.sh
+++ b/regress/putty-ciphers.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: putty-ciphers.sh,v 1.3 2008/11/10 02:06:35 djm Exp $ 1# $OpenBSD: putty-ciphers.sh,v 1.4 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="putty ciphers" 4tid="putty ciphers"
5 5
6DATA=/bin/ls
7COPY=${OBJ}/copy
8
9if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then 6if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
10 echo "putty interop tests not enabled" 7 echo "putty interop tests not enabled"
11 exit 0 8 exit 0
diff --git a/regress/putty-kex.sh b/regress/putty-kex.sh
index 293885a8a..1844d6599 100644
--- a/regress/putty-kex.sh
+++ b/regress/putty-kex.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: putty-kex.sh,v 1.2 2008/06/30 10:31:11 djm Exp $ 1# $OpenBSD: putty-kex.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="putty KEX" 4tid="putty KEX"
5 5
6DATA=/bin/ls
7COPY=${OBJ}/copy
8
9if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then 6if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
10 echo "putty interop tests not enabled" 7 echo "putty interop tests not enabled"
11 exit 0 8 exit 0
diff --git a/regress/putty-transfer.sh b/regress/putty-transfer.sh
index 9e1e1550a..aec0e04ee 100644
--- a/regress/putty-transfer.sh
+++ b/regress/putty-transfer.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: putty-transfer.sh,v 1.2 2008/06/30 10:31:11 djm Exp $ 1# $OpenBSD: putty-transfer.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="putty transfer data" 4tid="putty transfer data"
5 5
6DATA=/bin/ls
7COPY=${OBJ}/copy
8
9if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then 6if test "x$REGRESS_INTEROP_PUTTY" != "xyes" ; then
10 echo "putty interop tests not enabled" 7 echo "putty interop tests not enabled"
11 exit 0 8 exit 0
diff --git a/regress/reexec.sh b/regress/reexec.sh
index 9464eb699..5fff62a66 100644
--- a/regress/reexec.sh
+++ b/regress/reexec.sh
@@ -1,12 +1,10 @@
1# $OpenBSD: reexec.sh,v 1.5 2004/10/08 02:01:50 djm Exp $ 1# $OpenBSD: reexec.sh,v 1.6 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="reexec tests" 4tid="reexec tests"
5 5
6DATA=/bin/ls${EXEEXT} 6SSHD_ORIG=$SSHD
7COPY=${OBJ}/copy 7SSHD_COPY=$OBJ/sshd
8SSHD_ORIG=$SSHD${EXEEXT}
9SSHD_COPY=$OBJ/sshd${EXEEXT}
10 8
11# Start a sshd and then delete it 9# Start a sshd and then delete it
12start_sshd_copy () 10start_sshd_copy ()
diff --git a/regress/rekey.sh b/regress/rekey.sh
index cefdea534..8eb7efaf9 100644
--- a/regress/rekey.sh
+++ b/regress/rekey.sh
@@ -1,15 +1,11 @@
1# $OpenBSD: rekey.sh,v 1.7 2013/05/16 05:48:31 dtucker Exp $ 1# $OpenBSD: rekey.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="rekey" 4tid="rekey"
5 5
6DATA=${OBJ}/data
7COPY=${OBJ}/copy
8LOG=${TEST_SSH_LOGFILE} 6LOG=${TEST_SSH_LOGFILE}
9 7
10rm -f ${COPY} ${LOG} ${DATA} 8rm -f ${LOG}
11touch ${DATA}
12dd if=/bin/ls${EXEEXT} of=${DATA} bs=1k seek=511 count=1 > /dev/null 2>&1
13 9
14for s in 16 1k 128k 256k; do 10for s in 16 1k 128k 256k; do
15 verbose "client rekeylimit ${s}" 11 verbose "client rekeylimit ${s}"
diff --git a/regress/scp.sh b/regress/scp.sh
index c5d412dd9..ba5ba887d 100644
--- a/regress/scp.sh
+++ b/regress/scp.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: scp.sh,v 1.7 2006/01/31 10:36:33 djm Exp $ 1# $OpenBSD: scp.sh,v 1.8 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="scp" 4tid="scp"
@@ -12,8 +12,6 @@ else
12 DIFFOPT="-r" 12 DIFFOPT="-r"
13fi 13fi
14 14
15DATA=/bin/ls${EXEEXT}
16COPY=${OBJ}/copy
17COPY2=${OBJ}/copy2 15COPY2=${OBJ}/copy2
18DIR=${COPY}.dd 16DIR=${COPY}.dd
19DIR2=${COPY}.dd2 17DIR2=${COPY}.dd2
diff --git a/regress/sftp-badcmds.sh b/regress/sftp-badcmds.sh
index 08009f26b..3dbeb58ca 100644
--- a/regress/sftp-badcmds.sh
+++ b/regress/sftp-badcmds.sh
@@ -1,12 +1,10 @@
1# $OpenBSD: sftp-badcmds.sh,v 1.4 2009/08/13 01:11:55 djm Exp $ 1# $OpenBSD: sftp-badcmds.sh,v 1.5 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sftp invalid commands" 4tid="sftp invalid commands"
5 5
6DATA=/bin/ls${EXEEXT}
7DATA2=/bin/sh${EXEEXT} 6DATA2=/bin/sh${EXEEXT}
8NONEXIST=/NONEXIST.$$ 7NONEXIST=/NONEXIST.$$
9COPY=${OBJ}/copy
10GLOBFILES=`(cd /bin;echo l*)` 8GLOBFILES=`(cd /bin;echo l*)`
11 9
12rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd 10rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd
diff --git a/regress/sftp-batch.sh b/regress/sftp-batch.sh
index a51ef0782..41011549b 100644
--- a/regress/sftp-batch.sh
+++ b/regress/sftp-batch.sh
@@ -1,10 +1,8 @@
1# $OpenBSD: sftp-batch.sh,v 1.4 2009/08/13 01:11:55 djm Exp $ 1# $OpenBSD: sftp-batch.sh,v 1.5 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sftp batchfile" 4tid="sftp batchfile"
5 5
6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy
8BATCH=${OBJ}/sftp.bb 6BATCH=${OBJ}/sftp.bb
9 7
10rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.* 8rm -rf ${COPY} ${COPY}.1 ${COPY}.2 ${COPY}.dd ${BATCH}.*
diff --git a/regress/sftp-chroot.sh b/regress/sftp-chroot.sh
index 8c07979b4..98a364ebf 100644
--- a/regress/sftp-chroot.sh
+++ b/regress/sftp-chroot.sh
@@ -1,9 +1,8 @@
1# $OpenBSD: sftp-chroot.sh,v 1.1 2013/04/18 02:46:12 djm Exp $ 1# $OpenBSD: sftp-chroot.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="sftp in chroot" 4tid="sftp in chroot"
5 5
6COPY=${OBJ}/copy
7CHROOT=/var/run 6CHROOT=/var/run
8FILENAME=testdata_${USER} 7FILENAME=testdata_${USER}
9PRIVDATA=${CHROOT}/${FILENAME} 8PRIVDATA=${CHROOT}/${FILENAME}
@@ -18,7 +17,6 @@ $SUDO sh -c "echo mekmitastdigoat > $PRIVDATA" || \
18start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /" 17start_sshd -oChrootDirectory=$CHROOT -oForceCommand="internal-sftp -d /"
19 18
20verbose "test $tid: get" 19verbose "test $tid: get"
21rm -f ${COPY}
22${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \ 20${SFTP} -qS "$SSH" -F $OBJ/ssh_config host:/${FILENAME} $COPY || \
23 fatal "Fetch ${FILENAME} failed" 21 fatal "Fetch ${FILENAME} failed"
24cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ" 22cmp $PRIVDATA $COPY || fail "$PRIVDATA $COPY differ"
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index 2e0300e16..ba5ef066d 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: sftp-cmds.sh,v 1.12 2012/06/01 00:52:52 djm Exp $ 1# $OpenBSD: sftp-cmds.sh,v 1.13 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4# XXX - TODO: 4# XXX - TODO:
@@ -7,8 +7,6 @@
7 7
8tid="sftp commands" 8tid="sftp commands"
9 9
10DATA=/bin/ls${EXEEXT}
11COPY=${OBJ}/copy
12# test that these files are readable! 10# test that these files are readable!
13for i in `(cd /bin;echo l*)` 11for i in `(cd /bin;echo l*)`
14do 12do
diff --git a/regress/sftp.sh b/regress/sftp.sh
index f84fa6f4e..5f823ee23 100644
--- a/regress/sftp.sh
+++ b/regress/sftp.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: sftp.sh,v 1.3 2009/08/13 01:11:55 djm Exp $ 1# $OpenBSD: sftp.sh,v 1.4 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="basic sftp put/get" 4tid="basic sftp put/get"
5 5
6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy
8
9SFTPCMDFILE=${OBJ}/batch 6SFTPCMDFILE=${OBJ}/batch
10cat >$SFTPCMDFILE <<EOF 7cat >$SFTPCMDFILE <<EOF
11version 8version
diff --git a/regress/ssh-com-client.sh b/regress/ssh-com-client.sh
index 324a0a723..e4f80cf0a 100644
--- a/regress/ssh-com-client.sh
+++ b/regress/ssh-com-client.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: ssh-com-client.sh,v 1.6 2004/02/24 17:06:52 markus Exp $ 1# $OpenBSD: ssh-com-client.sh,v 1.7 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="connect with ssh.com client" 4tid="connect with ssh.com client"
@@ -67,10 +67,6 @@ EOF
67# we need a real server (no ProxyConnect option) 67# we need a real server (no ProxyConnect option)
68start_sshd 68start_sshd
69 69
70DATA=/bin/ls${EXEEXT}
71COPY=${OBJ}/copy
72rm -f ${COPY}
73
74# go for it 70# go for it
75for v in ${VERSIONS}; do 71for v in ${VERSIONS}; do
76 ssh2=${TEST_COMBASE}/${v}/ssh2 72 ssh2=${TEST_COMBASE}/${v}/ssh2
diff --git a/regress/ssh-com-sftp.sh b/regress/ssh-com-sftp.sh
index be6f4e0dc..fabfa4983 100644
--- a/regress/ssh-com-sftp.sh
+++ b/regress/ssh-com-sftp.sh
@@ -1,10 +1,8 @@
1# $OpenBSD: ssh-com-sftp.sh,v 1.6 2009/08/20 18:43:07 djm Exp $ 1# $OpenBSD: ssh-com-sftp.sh,v 1.7 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="basic sftp put/get with ssh.com server" 4tid="basic sftp put/get with ssh.com server"
5 5
6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy
8SFTPCMDFILE=${OBJ}/batch 6SFTPCMDFILE=${OBJ}/batch
9 7
10cat >$SFTPCMDFILE <<EOF 8cat >$SFTPCMDFILE <<EOF
diff --git a/regress/stderr-after-eof.sh b/regress/stderr-after-eof.sh
index 05a5ea56d..9072db282 100644
--- a/regress/stderr-after-eof.sh
+++ b/regress/stderr-after-eof.sh
@@ -1,12 +1,8 @@
1# $OpenBSD: stderr-after-eof.sh,v 1.1 2002/03/23 16:38:09 markus Exp $ 1# $OpenBSD: stderr-after-eof.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="stderr data after eof" 4tid="stderr data after eof"
5 5
6DATA=/etc/motd
7DATA=${OBJ}/data
8COPY=${OBJ}/copy
9
10if have_prog md5sum; then 6if have_prog md5sum; then
11 CHECKSUM=md5sum 7 CHECKSUM=md5sum
12elif have_prog openssl; then 8elif have_prog openssl; then
diff --git a/regress/stderr-data.sh b/regress/stderr-data.sh
index 1daf79bb5..b0bd2355c 100644
--- a/regress/stderr-data.sh
+++ b/regress/stderr-data.sh
@@ -1,12 +1,8 @@
1# $OpenBSD: stderr-data.sh,v 1.2 2002/03/27 22:39:52 markus Exp $ 1# $OpenBSD: stderr-data.sh,v 1.3 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="stderr data transfer" 4tid="stderr data transfer"
5 5
6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy
8rm -f ${COPY}
9
10for n in '' -n; do 6for n in '' -n; do
11for p in 1 2; do 7for p in 1 2; do
12 verbose "test $tid: proto $p ($n)" 8 verbose "test $tid: proto $p ($n)"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 0680eaa94..599b8d9ba 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.41 2013/05/17 00:37:40 dtucker Exp $ 1# $OpenBSD: test-exec.sh,v 1.42 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo
@@ -155,10 +155,6 @@ fi
155>$TEST_SSHD_LOGFILE 155>$TEST_SSHD_LOGFILE
156>$TEST_REGRESS_LOGFILE 156>$TEST_REGRESS_LOGFILE
157 157
158# Some data for test copies
159DATA=$OBJ/testdata
160cat $SSHD${EXEEXT} $SSHD${EXEEXT} $SSHD${EXEEXT} $SSHD${EXEEXT} >$DATA
161
162# Create wrapper ssh with logging. We can't just specify "SSH=ssh -E..." 158# Create wrapper ssh with logging. We can't just specify "SSH=ssh -E..."
163# because sftp and scp don't handle spaces in arguments. 159# because sftp and scp don't handle spaces in arguments.
164SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh 160SSHLOGWRAP=$OBJ/ssh-log-wrapper.sh
@@ -168,6 +164,15 @@ echo "exec ${SSH} -E${TEST_SSH_LOGFILE} "'"$@"' >>$SSHLOGWRAP
168chmod a+rx $OBJ/ssh-log-wrapper.sh 164chmod a+rx $OBJ/ssh-log-wrapper.sh
169SSH="$SSHLOGWRAP" 165SSH="$SSHLOGWRAP"
170 166
167# Some test data. We make a copy because some tests will overwrite it.
168# The tests may assume that $DATA exists and is writable and $COPY does
169# not exist.
170DATA=$OBJ/data
171cat $SSHD $SSHD $SSHD $SSHD >${DATA}
172chmod u+w ${DATA}
173COPY=$OBJ/copy
174rm -f ${COPY}
175
171# these should be used in tests 176# these should be used in tests
172export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP 177export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
173#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP 178#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
diff --git a/regress/transfer.sh b/regress/transfer.sh
index 13ea367d5..1ae3ef5bf 100644
--- a/regress/transfer.sh
+++ b/regress/transfer.sh
@@ -1,11 +1,8 @@
1# $OpenBSD: transfer.sh,v 1.1 2002/03/27 00:03:37 markus Exp $ 1# $OpenBSD: transfer.sh,v 1.2 2013/05/17 04:29:14 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4tid="transfer data" 4tid="transfer data"
5 5
6DATA=/bin/ls${EXEEXT}
7COPY=${OBJ}/copy
8
9for p in 1 2; do 6for p in 1 2; do
10 verbose "$tid: proto $p" 7 verbose "$tid: proto $p"
11 rm -f ${COPY} 8 rm -f ${COPY}