- (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and

[openssh.git] / regress / test-exec.sh

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 1eb9ff7297293a596e549f93dc2214e525d0e392..cf7665973d62f924035eae07b096a0b178584f67 100644 (file)
--- 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