diff options
| author | Damien Miller <djm@mindrot.org> | 2008-06-30 08:12:37 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-06-30 08:12:37 +1000 |
| commit | a766cea689dede98f2e2988119e27b5321144e84 (patch) | |
| tree | fb29d919ed4d33a1dee1de049d005fb168f9e0f7 | |
| parent | 4268a136d4da035a3d53dd6bc52ff1221240d9d8 (diff) | |
- (djm) [regress/Makefile] search for conch by path, like we do putty
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | regress/test-exec.sh | 12 |
2 files changed, 10 insertions, 5 deletions
@@ -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 @@ -4479,4 +4480,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.5037 2008/06/29 22:07:56 djm Exp $ +$Id: ChangeLog,v 1.5038 2008/06/29 22:12:37 djm Exp $ diff --git a/regress/test-exec.sh b/regress/test-exec.sh index 652bd49d..b5444891 100644 --- 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 |