- (djm) [regress/Makefile] search for conch by path, like we do putty

diff --git a/ChangeLog b/ChangeLog
index 979c28441037628674305cd0b5e42181291058d1..b5aa7ef7c06879f17dd6b76f386f9a3f57457583 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,7 @@
      very basic regress test against Twisted Conch in "make interop"
      target (conch is available in ports/devel/py-twisted/conch);
      ok markus@
+ - (djm) [regress/Makefile] search for conch by path, like we do putty
 
 20080629
  - (djm) OpenBSD CVS Sync

diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 652bd49d33072f423b2b908f74cde505925219ec..b544489121719ea3edfd16886b065465ec79f9fd 100644 (file)
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -70,9 +70,9 @@ SFTPSERVER=/usr/libexec/openssh/sftp-server
 SCP=scp
 
 # Interop testing
-PLINK=/usr/local/bin/plink
-PUTTYGEN=/usr/local/bin/puttygen
-CONCH=/usr/local/bin/conch
+PLINK=plink
+PUTTYGEN=puttygen
+CONCH=conch
 
 if [ "x$TEST_SSH_SSH" != "x" ]; then
        SSH="${TEST_SSH_SSH}"
@@ -116,7 +116,11 @@ if [ "x$TEST_SSH_PUTTYGEN" != "x" ]; then
        esac
 fi
 if [ "x$TEST_SSH_CONCH" != "x" ]; then
-       CONCH="${TEST_SSH_CONCH}"
+       # Find real binary, if it exists
+       case "${TEST_SSH_CONCH}" in
+       /*) CONCH="${TEST_SSH_CONCH}" ;;
+       *) CONCH=`which ${TEST_SSH_CONCH} 2>/dev/null` ;;
+       esac
 fi
 
 # Path to sshd must be absolute for rexec