diff options
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r-- | regress/test-exec.sh | 10 |
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 | ||
4 | PORT=4242 | 4 | PORT=4242 |
@@ -47,6 +47,7 @@ SSHKEYGEN=ssh-keygen | |||
47 | SSHKEYSCAN=ssh-keyscan | 47 | SSHKEYSCAN=ssh-keyscan |
48 | SFTP=sftp | 48 | SFTP=sftp |
49 | SFTPSERVER=/usr/libexec/openssh/sftp-server | 49 | SFTPSERVER=/usr/libexec/openssh/sftp-server |
50 | SCP=scp | ||
50 | 51 | ||
51 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 52 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
52 | SSH="${TEST_SSH_SSH}" | 53 | SSH="${TEST_SSH_SSH}" |
@@ -72,10 +73,13 @@ fi | |||
72 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then | 73 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then |
73 | SFTPSERVER="${TEST_SSH_SFTPSERVER}" | 74 | SFTPSERVER="${TEST_SSH_SFTPSERVER}" |
74 | fi | 75 | fi |
76 | if [ "x$TEST_SSH_SCP" != "x" ]; then | ||
77 | SCP="${TEST_SSH_SCP}" | ||
78 | fi | ||
75 | 79 | ||
76 | # these should be used in tests | 80 | # these should be used in tests |
77 | export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER | 81 | export 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 |
81 | echon() | 85 | echon() |