From c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Mar 2008 12:41:31 +1100
Subject:  - (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1)
 and    puttygen(1) by $PATH

---
 regress/test-exec.sh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'regress')

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
-- 
cgit v1.2.3