diff options
| author | Damien Miller <djm@mindrot.org> | 2008-03-13 02:41:31 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-03-13 02:41:31 +0100 |
| commit | c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa (patch) | |
| tree | d774a5b72579a67e800f9061a9f74ff66fac96c5 /regress/test-exec.sh | |
| parent | - (djm) [Makefile.in regress/Makefile] Fix interop-tests target (note to (diff) | |
| download | openssh-c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa.tar.xz openssh-c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa.zip | |
- (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
puttygen(1) by $PATH
Diffstat (limited to '')
| -rw-r--r-- | regress/test-exec.sh | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 1eb9ff729..cf7665973 100644 --- a/regress/test-exec.sh +++ b/regress/test-exec.sh @@ -101,10 +101,18 @@ if [ "x$TEST_SSH_SCP" != "x" ]; then SCP="${TEST_SSH_SCP}" fi if [ "x$TEST_SSH_PLINK" != "x" ]; then - PLINK="${TEST_SSH_PLINK}" + # Find real binary, if it exists + case "${TEST_SSH_PLINK}" in + /*) PLINK="${TEST_SSH_PLINK}" ;; + *) PLINK=`which ${TEST_SSH_PLINK}` ;; + esac fi if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then - PUTTYGEN="${TEST_SSH_PUTTYGEN}" + # Find real binary, if it exists + case "${TEST_SSH_PUTTYGEN}" in + /*) PUTTYGEN="${TEST_SSH_PUTTYGEN}" ;; + *) PUTTYGEN=`which ${TEST_SSH_PUTTYGEN}` ;; + esac fi # Path to sshd must be absolute for rexec |