[openssh-commits] [openssh] 01/02: Split regress-binaries into two targets.

git+noreply at mindrot.org git+noreply at mindrot.org
Tue Jul 23 23:25:36 AEST 2019


This is an automated email from the git hooks/post-receive script.

dtucker pushed a commit to branch master
in repository openssh.

commit e0055af2bd39fdb44566ff6594147664e1fac8b8
Author: Darren Tucker <dtucker at dtucker.net>
Date:   Tue Jul 23 23:06:22 2019 +1000

    Split regress-binaries into two targets.
    
    Split the binaries for the unit tests out into a regress-unit-binaries
    target, and add a dependency on it for only the unit tests.  This allows
    us to run the integration tests only ("make t-exec") without building
    the unit tests, which allows us to run a subset of the tests when
    building --without-openssl without trying (and failing) to build the
    unit tests.
    
    This means there are two targets for "unit" which I *think* is valid
    (it works in testing, and makedepend will generate Makefiles of this
    form)a but I could be wrong.
---
 Makefile.in | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 92ba0b37..269f0140 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -576,7 +576,9 @@ regress-binaries: regress/modpipe$(EXEEXT) \
 	regress/setuid-allowed$(EXEEXT) \
 	regress/netcat$(EXEEXT) \
 	regress/check-perm$(EXEEXT) \
-	regress/mkdtemp$(EXEEXT) \
+	regress/mkdtemp$(EXEEXT)
+
+regress-unit-binaries: \
 	regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
 	regress/unittests/sshkey/test_sshkey$(EXEEXT) \
 	regress/unittests/bitmap/test_bitmap$(EXEEXT) \
@@ -587,6 +589,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \
 	regress/unittests/utf8/test_utf8$(EXEEXT) \
 	regress/misc/kexfuzz/kexfuzz$(EXEEXT)
 
+unit: regress-unit-binaries
+
 tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
 	BUILDDIR=`pwd`; \
 	TEST_SSH_SCP="$${BUILDDIR}/scp"; \

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list