From: djm <djm>
Date: Thu, 13 Mar 2008 01:41:31 +0000 (+0000)
Subject:  - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
X-Git-Tag: V_4_9_P1~26
X-Git-Url: http://andersk.mit.edu/gitweb/openssh.git/commitdiff_plain/32f129d1c09b85b774535071fd15f3d29fe65acd

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

diff --git a/ChangeLog b/ChangeLog
index 5a97a156..a08351bd 100644
--- 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 bcd98acb..d6176433 100644
--- 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 1eb9ff72..cf766597 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