- (djm) [Makefile.in regress/scp-ssh-wrapper.sh regress/scp.sh] Make

   the scp regress test actually test the built scp rather than the one
   in $PATH. ok dtucker@

1 files changed, 3 insertions, 1 deletions

diff --git a/Makefile.in b/Makefile.in
index f5dd3b834..e3dfab2fa 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# $Id: Makefile.in,v 1.350 2014/01/17 05:47:04 djm Exp $
+# $Id: Makefile.in,v 1.351 2014/01/24 03:27:04 djm Exp $
 
 # uncomment if you run a non bourne compatable shell. Ie. csh
 #SHELL = @SH@
@@ -411,6 +411,7 @@ regress/setuid-allowed$(EXEEXT): $(srcdir)/regress/setuid-allowed.c
 tests interop-tests:    $(TARGETS) regress/modpipe$(EXEEXT)
         BUILDDIR=`pwd`; \
         TEST_SHELL="@TEST_SHELL@"; \
+        TEST_SSH_SCP="$${BUILDDIR}/scp"; \
         TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
         TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
         TEST_SSH_SSHAGENT="$${BUILDDIR}/ssh-agent"; \
@@ -434,6 +435,7 @@ tests interop-tests:	$(TARGETS) regress/modpipe$(EXEEXT)
                 PATH="$${BUILDDIR}:$${PATH}" \
                 TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
                 TEST_SHELL="$${TEST_SHELL}" \
+                TEST_SSH_SCP="$${TEST_SSH_SCP}" \
                 TEST_SSH_SSH="$${TEST_SSH_SSH}" \
                 TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \
                 TEST_SSH_SSHAGENT="$${TEST_SSH_SSHAGENT}" \