diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-07-24 06:21:19 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-24 06:21:19 +0200 |
| commit | 159e987a54d92ccd73875e7581ffc64e8927a715 (patch) | |
| tree | c6b2cced11d2a86bdaaa2f131fa3dfb8f237194c /Makefile.in | |
| parent | Add lib dependencies for regress binary targets. (diff) | |
| download | openssh-159e987a54d92ccd73875e7581ffc64e8927a715.tar.xz openssh-159e987a54d92ccd73875e7581ffc64e8927a715.zip | |
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.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 14 |
1 files changed, 11 insertions, 3 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 $(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"; \ |