summaryrefslogtreecommitdiff
path: root/regress/test-exec.sh
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-16 20:15:59 +1000
committerDarren Tucker <dtucker@zip.com.au>2004-06-16 20:15:59 +1000
commit50433a924344b295cd34ecdbba0c6b8f6add9231 (patch)
tree938e63b00cf4ae56b1579cc085c2a56661b1c980 /regress/test-exec.sh
parent4c37ef08abc56fe883e75333f04cf2a7382fce07 (diff)
- dtucker@cvs.openbsd.org 2004/06/13 13:51:02
[regress/Makefile regress/test-exec.sh, added regress/scp-ssh-wrapper.sh regress/scp.sh] Add scp regression test; with & ok markus@
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r--regress/test-exec.sh10
1 files changed, 7 insertions, 3 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index a0df0e957..c8827b631 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.16 2004/04/27 09:47:30 djm Exp $ 1# $OpenBSD: test-exec.sh,v 1.17 2004/06/13 13:51:02 dtucker Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4PORT=4242 4PORT=4242
@@ -47,6 +47,7 @@ SSHKEYGEN=ssh-keygen
47SSHKEYSCAN=ssh-keyscan 47SSHKEYSCAN=ssh-keyscan
48SFTP=sftp 48SFTP=sftp
49SFTPSERVER=/usr/libexec/openssh/sftp-server 49SFTPSERVER=/usr/libexec/openssh/sftp-server
50SCP=scp
50 51
51if [ "x$TEST_SSH_SSH" != "x" ]; then 52if [ "x$TEST_SSH_SSH" != "x" ]; then
52 SSH="${TEST_SSH_SSH}" 53 SSH="${TEST_SSH_SSH}"
@@ -72,10 +73,13 @@ fi
72if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then 73if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then
73 SFTPSERVER="${TEST_SSH_SFTPSERVER}" 74 SFTPSERVER="${TEST_SSH_SFTPSERVER}"
74fi 75fi
76if [ "x$TEST_SSH_SCP" != "x" ]; then
77 SCP="${TEST_SSH_SCP}"
78fi
75 79
76# these should be used in tests 80# these should be used in tests
77export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER 81export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
78#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER 82#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
79 83
80# helper 84# helper
81echon() 85echon()