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

   puttygen(1) by $PATH

diff --git a/ChangeLog b/ChangeLog
index 5a97a1563ed2f400cc326386b3147fc53f8cb74e..a08351bdca2832b6d4d86becfc8855db87449f2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 20080313
  - (djm) [Makefile.in regress/Makefile] Fix interop-tests target (note to
    self: make changes to Makefile.in next time, not the generated Makefile).
+ - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
+   puttygen(1) by $PATH
 
 20080312
  - (djm) OpenBSD CVS Sync

diff --git a/Makefile.in b/Makefile.in
index bcd98acb13bd15de033e796c940bdb4bff58a85a..d61764338d1c376baaa5dbdf68ca023236cd4e66 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -392,6 +392,8 @@ tests interop-tests:        $(TARGETS)
        TEST_SSH_SSHKEYSCAN="$${BUILDDIR}/ssh-keyscan"; \
        TEST_SSH_SFTP="$${BUILDDIR}/sftp"; \
        TEST_SSH_SFTPSERVER="$${BUILDDIR}/sftp-server"; \
+       TEST_SSH_PLINK="plink"; \
+       TEST_SSH_PUTTYGEN="puttygen"; \
        cd $(srcdir)/regress || exit $$?; \
        $(MAKE) \
                .OBJDIR="$${BUILDDIR}/regress" \
@@ -408,6 +410,8 @@ tests interop-tests:        $(TARGETS)
                TEST_SSH_SSHKEYSCAN="$${TEST_SSH_SSHKEYSCAN}" \
                TEST_SSH_SFTP="$${TEST_SSH_SFTP}" \
                TEST_SSH_SFTPSERVER="$${TEST_SSH_SFTPSERVER}" \
+               TEST_SSH_PLINK="$${TEST_SSH_PLINK}" \
+               TEST_SSH_PUTTYGEN="$${TEST_SSH_PUTTYGEN}" \
                EXEEXT="$(EXEEXT)" \
                $@
 

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