diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-02-29 20:31:08 +1100 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-02-29 20:31:08 +1100 |
commit | 03c907a22b0ef594745699927d784c4ae9ec68b1 (patch) | |
tree | 5094d872c6c9d3c5d9b83ba942f0532b5c43487a | |
parent | 017fd61a9266049f8bed8ef742992a75cd6ca33f (diff) |
- markus@cvs.openbsd.org 2004/02/24 16:56:30
[regress/test-exec.sh]
allow arguments in ${TEST_SSH_XXX}
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | regress/test-exec.sh | 18 |
2 files changed, 13 insertions, 10 deletions
@@ -18,6 +18,9 @@ | |||
18 | - dtucker@cvs.openbsd.org 2004/02/17 08:23:20 | 18 | - dtucker@cvs.openbsd.org 2004/02/17 08:23:20 |
19 | [regress/Makefile regress/login-timeout.sh] | 19 | [regress/Makefile regress/login-timeout.sh] |
20 | Add regression test for LoginGraceTime; ok markus@ | 20 | Add regression test for LoginGraceTime; ok markus@ |
21 | - markus@cvs.openbsd.org 2004/02/24 16:56:30 | ||
22 | [regress/test-exec.sh] | ||
23 | allow arguments in ${TEST_SSH_XXX} | ||
21 | 24 | ||
22 | 20040226 | 25 | 20040226 |
23 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream | 26 | - (bal) KNF our sshlogin.c even if the code looks nothing like upstream |
@@ -823,4 +826,4 @@ | |||
823 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM | 826 | - (djm) Trim deprecated options from INSTALL. Mention UsePAM |
824 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu | 827 | - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu |
825 | 828 | ||
826 | $Id: ChangeLog,v 1.3265 2004/02/29 09:30:17 dtucker Exp $ | 829 | $Id: ChangeLog,v 1.3266 2004/02/29 09:31:08 dtucker Exp $ |
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 98851dc97..986d99287 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: test-exec.sh,v 1.14 2002/04/15 15:19:48 markus Exp $ | 1 | # $OpenBSD: test-exec.sh,v 1.15 2004/02/24 16:56:30 markus Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | PORT=4242 | 4 | PORT=4242 |
@@ -49,28 +49,28 @@ SFTP=sftp | |||
49 | SFTPSERVER=/usr/libexec/openssh/sftp-server | 49 | SFTPSERVER=/usr/libexec/openssh/sftp-server |
50 | 50 | ||
51 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 51 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
52 | SSH=${TEST_SSH_SSH} | 52 | SSH="${TEST_SSH_SSH}" |
53 | fi | 53 | fi |
54 | if [ "x$TEST_SSH_SSHD" != "x" ]; then | 54 | if [ "x$TEST_SSH_SSHD" != "x" ]; then |
55 | SSHD=${TEST_SSH_SSHD} | 55 | SSHD="${TEST_SSH_SSHD}" |
56 | fi | 56 | fi |
57 | if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then | 57 | if [ "x$TEST_SSH_SSHAGENT" != "x" ]; then |
58 | SSHAGENT=${TEST_SSH_SSHAGENT} | 58 | SSHAGENT="${TEST_SSH_SSHAGENT}" |
59 | fi | 59 | fi |
60 | if [ "x$TEST_SSH_SSHADD" != "x" ]; then | 60 | if [ "x$TEST_SSH_SSHADD" != "x" ]; then |
61 | SSHADD=${TEST_SSH_SSHADD} | 61 | SSHADD="${TEST_SSH_SSHADD}" |
62 | fi | 62 | fi |
63 | if [ "x$TEST_SSH_SSHKEYGEN" != "x" ]; then | 63 | if [ "x$TEST_SSH_SSHKEYGEN" != "x" ]; then |
64 | SSHKEYGEN=${TEST_SSH_SSHKEYGEN} | 64 | SSHKEYGEN="${TEST_SSH_SSHKEYGEN}" |
65 | fi | 65 | fi |
66 | if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then | 66 | if [ "x$TEST_SSH_SSHKEYSCAN" != "x" ]; then |
67 | SSHKEYSCAN=${TEST_SSH_SSHKEYSCAN} | 67 | SSHKEYSCAN="${TEST_SSH_SSHKEYSCAN}" |
68 | fi | 68 | fi |
69 | if [ "x$TEST_SSH_SFTP" != "x" ]; then | 69 | if [ "x$TEST_SSH_SFTP" != "x" ]; then |
70 | SFTP=${TEST_SSH_SFTP} | 70 | SFTP="${TEST_SSH_SFTP}" |
71 | fi | 71 | fi |
72 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then | 72 | if [ "x$TEST_SSH_SFTPSERVER" != "x" ]; then |
73 | SFTPSERVER=${TEST_SSH_SFTPSERVER} | 73 | SFTPSERVER="${TEST_SSH_SFTPSERVER}" |
74 | fi | 74 | fi |
75 | 75 | ||
76 | # these should be used in tests | 76 | # these should be used in tests |