summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2019-07-23 23:06:22 +1000
committerDarren Tucker <dtucker@dtucker.net>2019-07-23 23:18:17 +1000
commite0055af2bd39fdb44566ff6594147664e1fac8b8 (patch)
treec4bab1a5d4fbe9d198353a463a34f6a3854424b0 /Makefile.in
parent7cdf9fdcf11aaaa98c2bd22c92882ea559e772ad (diff)
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.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 92ba0b37e..269f0140d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -576,7 +576,9 @@ regress-binaries: regress/modpipe$(EXEEXT) \
576 regress/setuid-allowed$(EXEEXT) \ 576 regress/setuid-allowed$(EXEEXT) \
577 regress/netcat$(EXEEXT) \ 577 regress/netcat$(EXEEXT) \
578 regress/check-perm$(EXEEXT) \ 578 regress/check-perm$(EXEEXT) \
579 regress/mkdtemp$(EXEEXT) \ 579 regress/mkdtemp$(EXEEXT)
580
581regress-unit-binaries: \
580 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ 582 regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \
581 regress/unittests/sshkey/test_sshkey$(EXEEXT) \ 583 regress/unittests/sshkey/test_sshkey$(EXEEXT) \
582 regress/unittests/bitmap/test_bitmap$(EXEEXT) \ 584 regress/unittests/bitmap/test_bitmap$(EXEEXT) \
@@ -587,6 +589,8 @@ regress-binaries: regress/modpipe$(EXEEXT) \
587 regress/unittests/utf8/test_utf8$(EXEEXT) \ 589 regress/unittests/utf8/test_utf8$(EXEEXT) \
588 regress/misc/kexfuzz/kexfuzz$(EXEEXT) 590 regress/misc/kexfuzz/kexfuzz$(EXEEXT)
589 591
592unit: regress-unit-binaries
593
590tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS) 594tests interop-tests t-exec unit: regress-prep regress-binaries $(TARGETS)
591 BUILDDIR=`pwd`; \ 595 BUILDDIR=`pwd`; \
592 TEST_SSH_SCP="$${BUILDDIR}/scp"; \ 596 TEST_SSH_SCP="$${BUILDDIR}/scp"; \