diff options
| author | Damien Miller <djm@mindrot.org> | 2008-03-13 12:41:31 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2008-03-13 12:41:31 +1100 |
| commit | c2cefb0fe9b310d4edc3fc28e5aac2e2cfb6d6aa (patch) | |
| tree | d774a5b72579a67e800f9061a9f74ff66fac96c5 | |
| parent | 664299613492f3c1227cba631c3dc0d75965d622 (diff) | |
- (djm) [Makefile.in regress/test-exec.sh] Find installed plink(1) and
puttygen(1) by $PATH
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.in | 6 | ||||
| -rw-r--r-- | regress/test-exec.sh | 12 |
3 files changed, 18 insertions, 4 deletions
@@ -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 @@ -3744,4 +3746,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.4871 2008/03/13 01:05:40 djm Exp $ +$Id: ChangeLog,v 1.4872 2008/03/13 01:41:31 djm Exp $ diff --git a/Makefile.in b/Makefile.in index 3dc71fee..6b488fec 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.288 2008/03/13 01:05:40 djm Exp $ +# $Id: Makefile.in,v 1.289 2008/03/13 01:41:31 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -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 |