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 3bf72979..0634fa33 100644 --- a/Makefile.in +++ b/Makefile.in @@ -572,14 +572,14 @@ regress/misc/kexfuzz/kexfuzz$(EXEEXT): ${MISC_KEX_FUZZ_OBJS} libssh.a $(LD) -o $@ $(LDFLAGS) $(MISC_KEX_FUZZ_OBJS) \ -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS) -regress-binaries: $(LIBCOMPAT) \ +regress-binaries: regress-prep $(LIBCOMPAT) \ regress/modpipe$(EXEEXT) \ regress/setuid-allowed$(EXEEXT) \ regress/netcat$(EXEEXT) \ regress/check-perm$(EXEEXT) \ regress/mkdtemp$(EXEEXT) -regress-unit-binaries: $(REGRESSLIBS) \ +regress-unit-binaries: regress-prep $(REGRESSLIBS) \ regress/unittests/sshbuf/test_sshbuf$(EXEEXT) \ regress/unittests/sshkey/test_sshkey$(EXEEXT) \ regress/unittests/bitmap/test_bitmap$(EXEEXT) \ @@ -590,9 +590,17 @@ regress-unit-binaries: $(REGRESSLIBS) \ regress/unittests/utf8/test_utf8$(EXEEXT) \ regress/misc/kexfuzz/kexfuzz$(EXEEXT) +tests: file-tests t-exec interop-tests unit + unit: regress-unit-binaries + BUILDDIR=`pwd`; \ + cd $(srcdir)/regress || exit $$?; \ + $(MAKE) \ + .OBJDIR="$${BUILDDIR}/regress" \ + .CURDIR="`pwd`" \ + $@ -tests interop-tests t-exec: unit regress-prep regress-binaries $(TARGETS) +interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) BUILDDIR=`pwd`; \ TEST_SSH_SCP="$${BUILDDIR}/scp"; \ TEST_SSH_SSH="$${BUILDDIR}/ssh"; \ diff --git a/regress/Makefile b/regress/Makefile index daaa10c5..ccdd91cc 100644 --- a/regress/Makefile +++ b/regress/Makefile @@ -1,7 +1,11 @@ # $OpenBSD: Makefile,v 1.103 2019/07/16 03:21:54 dtucker Exp $ -REGRESS_TARGETS= unit t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 t-exec -tests: prep $(REGRESS_TARGETS) +tests: prep file-tests t-exec unit + +REGRESS_TARGETS= t1 t2 t3 t4 t5 t6 t7 t8 t9 t10 t11 t12 + +# File based tests +file-tests: $(REGRESS_TARGETS) # Interop tests are not run by default interop interop-tests: t-exec-interop |