diff options
author | Darren Tucker <dtucker@dtucker.net> | 2019-07-24 14:21:19 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-24 14:21:19 +1000 |
commit | 159e987a54d92ccd73875e7581ffc64e8927a715 (patch) | |
tree | c6b2cced11d2a86bdaaa2f131fa3dfb8f237194c | |
parent | 520d4550a2470106d63e30079bb05ce82f3a4f7d (diff) |
Split test targets further.
Splits test into file-tests, t-exec, unit and interop-tests and their
respective dependencies. Should allow running any set individually
without having to build the other dependencies that are not needed
for that specific test.
-rw-r--r-- | Makefile.in | 14 | ||||
-rw-r--r-- | regress/Makefile | 8 |
2 files changed, 17 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 3bf729799..0634fa333 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -572,14 +572,14 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a | |||
572 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ | 572 | $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ |
573 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) | 573 | -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) |
574 | 574 | ||
575 | regress-binaries: $(LIBCOMPAT) \ | 575 | regress-binaries: regress-prep $(LIBCOMPAT) \ |
576 | regress/modpipe$(EXEEXT) \ | 576 | regress/modpipe$(EXEEXT) \ |
577 | regress/setuid-allowed$(EXEEXT) \ | 577 | regress/setuid-allowed$(EXEEXT) \ |
578 | regress/netcat$(EXEEXT) \ | 578 | regress/netcat$(EXEEXT) \ |
579 | regress/check-perm$(EXEEXT) \ | 579 | regress/check-perm$(EXEEXT) \ |
580 | regress/mkdtemp$(EXEEXT) | 580 | regress/mkdtemp$(EXEEXT) |
581 | 581 | ||
582 | regress-unit-binaries: $(REGRESSLIBS) \ | 582 | regress-unit-binaries: regress-prep $(REGRESSLIBS) \ |
583 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ | 583 | regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ |
584 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ | 584 | regress/unittests/sshkey/test_sshkey$(EXEEXT) \ |
585 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ | 585 | regress/unittests/bitmap/test_bitmap$(EXEEXT) \ |
@@ -590,9 +590,17 @@ regress-unit-binaries: $(REGRESSLIBS) \ | |||
590 | regress/unittests/utf8/test_utf8$(EXEEXT) \ | 590 | regress/unittests/utf8/test_utf8$(EXEEXT) \ |
591 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) | 591 | regress/misc/kexfuzz/kexfuzz$(EXEEXT) |
592 | 592 | ||
593 | tests: file-tests t-exec interop-tests unit | ||
594 | |||
593 | unit: regress-unit-binaries | 595 | unit: regress-unit-binaries |
596 | BUILDDIR=`pwd`; \ | ||
597 | cd $(srcdir)/regress || exit $$?; \ | ||
598 | $(MAKE) \ | ||
599 | .OBJDIR="$${BUILDDIR}/regress" \ | ||
600 | .CURDIR="`pwd`" \ | ||
601 | $@ | ||
594 | 602 | ||
595 | tests interop-tests t-exec: unit regress-prep regress-binaries $(TARGETS) | 603 | interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) |
596 | BUILDDIR=`pwd`; \ | 604 | BUILDDIR=`pwd`; \ |
597 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ | 605 | TEST_SSH_SCP="$${BUILDDIR}/scp"; \ |
598 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ | 606 | TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ |
diff --git a/regress/Makefile b/regress/Makefile index daaa10c5b..ccdd91cc4 100644 --- a/regress/Makefile +++ b/regress/Makefile | |||
@@ -1,7 +1,11 @@ | |||
1 | # $OpenBSD: Makefile,v 1.103 2019/07/16 03:21:54 dtucker Exp $ | 1 | # $OpenBSD: Makefile,v 1.103 2019/07/16 03:21:54 dtucker Exp $ |
2 | 2 | ||
3 | REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec | 3 | tests: prep file-tests t-exec unit |
4 | tests: prep $(REGRESS_TARGETS) | 4 | |
5 | REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 | ||
6 | |||
7 | # File based tests | ||
8 | file-tests: $(REGRESS_TARGETS) | ||
5 | 9 | ||
6 | # Interop tests are not run by default | 10 | # Interop tests are not run by default |
7 | interop interop-tests: t-exec-interop | 11 | interop interop-tests: t-exec-interop |