RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

puttygen(1) by $PATH
This commit is contained in:
Damien Miller 2008-03-13 12:41:31 +11:00
parent 6642996134
commit c2cefb0fe9
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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 $

6
Makefile.in
View File

@ -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)" \
$@

12
regress/test-exec.sh
View File

@ -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