diff options
| author | Damien Miller <djm@mindrot.org> | 2014-08-30 16:23:06 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2014-08-30 16:23:06 +1000 |
| commit | 41c8de2c0031cf59e7cf0c06b5bcfbf4852c1fda (patch) | |
| tree | 30f415eddadf3cd53bb7bdb615fae4f18d1b23b4 | |
| parent | d7c81e216a7bd9eed6e239c970d9261bb1651947 (diff) | |
| download | openssh-git-41c8de2c0031cf59e7cf0c06b5bcfbf4852c1fda.tar.gz | |
- (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | Makefile.in | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -3,6 +3,7 @@ OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them - (djm) [misc.c] Missing newline between functions - (djm) [openbsd-compat/openssl-compat.h] add include guard + - (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@ 20140827 - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c] diff --git a/Makefile.in b/Makefile.in index 35887a8e..06be3d5d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.364 2014/08/21 00:47:55 djm Exp $ +# $Id: Makefile.in,v 1.365 2014/08/30 06:23:07 djm Exp $ # uncomment if you run a non bourne compatable shell. Ie. csh #SHELL = @SH@ @@ -29,6 +29,7 @@ SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper PRIVSEP_PATH=@PRIVSEP_PATH@ SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ STRIP_OPT=@STRIP_OPT@ +TEST_SHELL=@TEST_SHELL@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ @@ -480,7 +481,6 @@ REGRESS_BINARIES=\ tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) BUILDDIR=`pwd`; \ - TEST_SHELL="@TEST_SHELL@"; \ TEST_SSH_SCP="$${BUILDDIR}/scp"; \ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ @@ -504,7 +504,6 @@ tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) OBJ="$${BUILDDIR}/regress/" \ 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}" \ @@ -520,6 +519,7 @@ tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) TEST_SSH_CONCH="$${TEST_SSH_CONCH}" \ TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ TEST_SSH_ECC="$${TEST_SSH_ECC}" \ + TEST_SHELL="${TEST_SHELL}" \ EXEEXT="$(EXEEXT)" \ $@ && echo all tests passed |