tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@

This commit is contained in:
Damien Miller 2014-08-30 16:23:06 +10:00
parent d7c81e216a
commit 41c8de2c00
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -3,6 +3,7 @@
OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them OPENSSL_[RD]SA_MAX_MODULUS_BITS defines for OpenSSL that lacks them
- (djm) [misc.c] Missing newline between functions - (djm) [misc.c] Missing newline between functions
- (djm) [openbsd-compat/openssl-compat.h] add include guard - (djm) [openbsd-compat/openssl-compat.h] add include guard
- (djm) [Makefile.in] Make TEST_SHELL a variable; "good idea" tim@
20140827 20140827
- (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c] - (djm) [regress/unittests/sshbuf/test_sshbuf_getput_crypto.c]

6
Makefile.in
View File

@ -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 # uncomment if you run a non bourne compatable shell. Ie. csh
#SHELL = @SH@ #SHELL = @SH@
@ -29,6 +29,7 @@ SSH_PKCS11_HELPER=$(libexecdir)/ssh-pkcs11-helper
PRIVSEP_PATH=@PRIVSEP_PATH@ PRIVSEP_PATH=@PRIVSEP_PATH@
SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@ SSH_PRIVSEP_USER=@SSH_PRIVSEP_USER@
STRIP_OPT=@STRIP_OPT@ STRIP_OPT=@STRIP_OPT@
TEST_SHELL=@TEST_SHELL@
PATHS= -DSSHDIR=\"$(sysconfdir)\" \ PATHS= -DSSHDIR=\"$(sysconfdir)\" \
-D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \ -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" \
@ -480,7 +481,6 @@ REGRESS_BINARIES=\
tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES) tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
BUILDDIR=`pwd`; \ BUILDDIR=`pwd`; \
TEST_SHELL="@TEST_SHELL@"; \
TEST_SSH_SCP="$${BUILDDIR}/scp"; \ TEST_SSH_SCP="$${BUILDDIR}/scp"; \
TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \
TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \ TEST_SSH_SSHD="$${BUILDDIR}/sshd"; \
@ -504,7 +504,6 @@ tests interop-tests t-exec: regress-prep $(TARGETS) $(REGRESS_BINARIES)
OBJ="$${BUILDDIR}/regress/" \ OBJ="$${BUILDDIR}/regress/" \
PATH="$${BUILDDIR}:$${PATH}" \ PATH="$${BUILDDIR}:$${PATH}" \
TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \ TEST_ENV=MALLOC_OPTIONS="@TEST_MALLOC_OPTIONS@" \
TEST_SHELL="$${TEST_SHELL}" \
TEST_SSH_SCP="$${TEST_SSH_SCP}" \ TEST_SSH_SCP="$${TEST_SSH_SCP}" \
TEST_SSH_SSH="$${TEST_SSH_SSH}" \ TEST_SSH_SSH="$${TEST_SSH_SSH}" \
TEST_SSH_SSHD="$${TEST_SSH_SSHD}" \ 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_CONCH="$${TEST_SSH_CONCH}" \
TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \ TEST_SSH_IPV6="$${TEST_SSH_IPV6}" \
TEST_SSH_ECC="$${TEST_SSH_ECC}" \ TEST_SSH_ECC="$${TEST_SSH_ECC}" \
TEST_SHELL="${TEST_SHELL}" \
EXEEXT="$(EXEEXT)" \ EXEEXT="$(EXEEXT)" \
$@ && echo all tests passed $@ && echo all tests passed