diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-30 08:12:37 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-30 08:12:37 +1000 |
commit | a766cea689dede98f2e2988119e27b5321144e84 (patch) | |
tree | fb29d919ed4d33a1dee1de049d005fb168f9e0f7 /regress | |
parent | 4268a136d4da035a3d53dd6bc52ff1221240d9d8 (diff) |
- (djm) [regress/Makefile] search for conch by path, like we do putty
Diffstat (limited to 'regress')
-rw-r--r-- | regress/test-exec.sh | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 652bd49d3..b54448912 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh | |||
@@ -70,9 +70,9 @@ SFTPSERVER=/usr/libexec/openssh/sftp-server | |||
70 | SCP=scp | 70 | SCP=scp |
71 | 71 | ||
72 | # Interop testing | 72 | # Interop testing |
73 | PLINK=/usr/local/bin/plink | 73 | PLINK=plink |
74 | PUTTYGEN=/usr/local/bin/puttygen | 74 | PUTTYGEN=puttygen |
75 | CONCH=/usr/local/bin/conch | 75 | CONCH=conch |
76 | 76 | ||
77 | if [ "x$TEST_SSH_SSH" != "x" ]; then | 77 | if [ "x$TEST_SSH_SSH" != "x" ]; then |
78 | SSH="${TEST_SSH_SSH}" | 78 | SSH="${TEST_SSH_SSH}" |
@@ -116,7 +116,11 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then | |||
116 | esac | 116 | esac |
117 | fi | 117 | fi |
118 | if [ "x$TEST_SSH_CONCH" != "x" ]; then | 118 | if [ "x$TEST_SSH_CONCH" != "x" ]; then |
119 | CONCH="${TEST_SSH_CONCH}" | 119 | # Find real binary, if it exists |
120 | case "${TEST_SSH_CONCH}" in | ||
121 | /*) CONCH="${TEST_SSH_CONCH}" ;; | ||
122 | *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;; | ||
123 | esac | ||
120 | fi | 124 | fi |
121 | 125 | ||
122 | # Path to sshd must be absolute for rexec | 126 | # Path to sshd must be absolute for rexec |