summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.in4
2 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95c9bee5c..156cbc729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -39,6 +39,8 @@
39 merge) 39 merge)
40 - (dtucker) [auth2-gss.c gss-serv-krb5.c] Include misc.h for fwd_opts, used 40 - (dtucker) [auth2-gss.c gss-serv-krb5.c] Include misc.h for fwd_opts, used
41 in servconf.h. 41 in servconf.h.
42 - (dtucker) [Makefile.in] Add a t-exec target to run just the executable
43 tests.
42 44
4320140717 4520140717
44 - (djm) [digest-openssl.c] Preserve array order when disabling digests. 46 - (djm) [digest-openssl.c] Preserve array order when disabling digests.
diff --git a/Makefile.in b/Makefile.in
index 9adc0daaf..78a4cba98 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
1# $Id: Makefile.in,v 1.361 2014/07/02 07:38:32 djm Exp $ 1# $Id: Makefile.in,v 1.362 2014/07/18 20:33:12 dtucker Exp $
2 2
3# uncomment if you run a non bourne compatable shell. Ie. csh 3# uncomment if you run a non bourne compatable shell. Ie. csh
4#SHELL = @SH@ 4#SHELL = @SH@
@@ -478,7 +478,7 @@ REGRESS_BINARIES=\
478 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ 478 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
479 regress/unittests/sshkey/test_sshkey$(EXEEXT) 479 regress/unittests/sshkey/test_sshkey$(EXEEXT)
480 480
481tests interop-tests: regress-prep $(TARGETS) $(REGRESS_BINARIES) 481tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
482 BUILDDIR=`pwd`; \ 482 BUILDDIR=`pwd`; \
483 TEST_SHELL="@TEST_SHELL@"; \ 483 TEST_SHELL="@TEST_SHELL@"; \
484 TEST_SSH_SCP="$${BUILDDIR}/scp"; \ 484 TEST_SSH_SCP="$${BUILDDIR}/scp"; \