diff options
| author | Jacob Champion <jchampion@apache.org> | 2017-01-05 00:14:27 +0100 |
|---|---|---|
| committer | Jacob Champion <jchampion@apache.org> | 2017-01-05 00:14:27 +0100 |
| commit | c856f32b9616aac5f0803305638784e56c3f3791 (patch) | |
| tree | 31155f1e8277fcb508183928a392d168b0d0271d /Makefile.in | |
| parent | An experimental branch for integrating Apache::Test with httpd (diff) | |
| download | apache2-c856f32b9616aac5f0803305638784e56c3f3791.tar.xz apache2-c856f32b9616aac5f0803305638784e56c3f3791.zip | |
Add a --with-test-suite option for "in-tree" testing
Step one. It's not actually "in-tree" yet, since it requires running
`make install` first, but at least it gives us a `make check`.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-test-integration@1777384 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index b166700b6f..a568b765e1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -295,5 +295,24 @@ update-log-tags update-log-msg-tags: find server modules os -name \*.c|xargs perl \ docs/log-message-tags/update-log-msg-tags +# TODO: don't require an install of the server binaries to run the tests +APXS_LOCATION := $(DESTDIR)$(bindir)/apxs + +check: + @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 + @if ! test -f "$(APXS_LOCATION)"; then \ + echo "Can't find apxs at '$(APXS_LOCATION)'"; \ + echo "Unfortunately the 'in-tree' tests don't run yet without first running 'make install'. Sorry."; \ + false; \ + fi + cd "$(TEST_SUITE_LOCATION)" && \ + perl Makefile.PL -apxs "$(APXS_LOCATION)" && \ + ./t/TEST -clean && \ + ./t/TEST -config && \ + ./t/TEST + # XXX: This looks awfully platform-specific [read: bad form and style] include $(top_srcdir)/os/os2/core.mk |