diff options
| author | Joe Orton <jorton@apache.org> | 2018-06-07 13:17:27 +0000 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2018-06-07 13:17:27 +0000 |
| commit | c2f9d44ea901541debb734be88f0d9f3621f3df9 (patch) | |
| tree | 109b218bd5eb32845b234395e667b7b56fb21186 /Makefile.in | |
| parent | 7711d39400b6b2a8d210fb85b32bad59cf2a9d49 (diff) | |
| download | httpd-c2f9d44ea901541debb734be88f0d9f3621f3df9.tar.gz | |
* configure.in, Makefile.in: Handle no-test-suite case through
check-no rule. Only regenerate the test suite on repeated
"make check" run if a header file has changed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1833122 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 802aaa6390..7285cf00b8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -430,17 +430,27 @@ check/build/config_vars.mk: build/config_vars.out echo "sbindir = $(top_builddir)/check/bin" >> $@ echo "bindir = $(top_builddir)/check/bin" >> $@ -# Run the Apache::Test suite if it has been configured with --with-test-suite. -check: check-include check-dirs check-conf check/build/config_vars.mk check-binaries - @if test "x$(TEST_SUITE_LOCATION)" = "xno"; then \ - echo 'Re-run configure with the --with-test-suite option to enable in-tree tests.'; \ - false; \ - fi +# Generate config & modules etc from scratch any time a header file is +# touched, so e.g. we don't get MMN mismatch against the modules built +# in .../c-modules. +$(TEST_SUITE_LOCATION)/Makefile: $(TEST_SUITE_LOCATION)/Makefile.PL $(INSTALL_HEADERS) cd "$(TEST_SUITE_LOCATION)" && \ perl Makefile.PL -apxs "$(top_builddir)/check/bin/apxs" && \ ./t/TEST -clean && \ - ./t/TEST -config && \ - ./t/TEST $(TESTS) + ./t/TEST -config + +check-make: $(TEST_SUITE_LOCATION)/Makefile + +check-no: + @echo 'Re-run configure with the --with-test-suite option to enable in-tree tests.' + @false + +check-yes: check-include check-dirs check-conf check/build/config_vars.mk \ + check-binaries $(TEST_SUITE_LOCATION)/Makefile + cd $(TEST_SUITE_LOCATION) && ./t/TEST $(TESTS) + +# Run the Apache::Test suite if it has been configured with --with-test-suite. +check: check-$(WITH_TEST_SUITE) # # Unit Test Suite |