diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2019-07-23 15:06:22 +0200 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2019-07-23 15:18:17 +0200 |
| commit | e0055af2bd39fdb44566ff6594147664e1fac8b8 (patch) | |
| tree | c4bab1a5d4fbe9d198353a463a34f6a3854424b0 | |
| parent | upstream: Skip DH group generation test if binaries don't support (diff) | |
| download | openssh-e0055af2bd39fdb44566ff6594147664e1fac8b8.tar.xz openssh-e0055af2bd39fdb44566ff6594147664e1fac8b8.zip | |
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.
| -rw-r--r-- | Makefile.in | 6 |
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) \ 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"; \ |