From: Joe Orton Date: Tue, 9 Jun 2020 10:11:33 +0000 (+0000) Subject: * Makefile.in: Add TEST_CONFIG variable to specify flags for X-Git-Tag: 2.5.0-alpha2-ci-test-only~1392 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99457bced289a6d5e989efde4f93e2d60ff61d41;p=thirdparty%2Fapache%2Fhttpd.git * Makefile.in: Add TEST_CONFIG variable to specify flags for all ./t/TEST invocations. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1878657 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/Makefile.in b/Makefile.in index 40c025a94cb..df59db6fde6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -36,7 +36,8 @@ EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \ httpd.spec PHONY_TARGETS := check check-conf check-dirs check-include unittest-objdir -TESTS = +TESTS = +TEST_CONFIG = include $(top_builddir)/build/rules.mk include $(top_srcdir)/build/program.mk @@ -443,7 +444,7 @@ $(TEST_SUITE_LOCATION)/Makefile: $(TEST_SUITE_LOCATION)/Makefile.PL $(INSTALL_HE cd "$(TEST_SUITE_LOCATION)" && \ perl Makefile.PL -apxs "$(top_builddir)/check/bin/apxs" && \ ./t/TEST -clean && \ - ./t/TEST -config + ./t/TEST -config $(TEST_CONFIG) check-make: $(TEST_SUITE_LOCATION)/Makefile @@ -453,7 +454,7 @@ check-no: check-yes: check-include check-dirs check-conf check/build/config_vars.mk \ check-binaries $(TEST_SUITE_LOCATION)/Makefile - cd $(TEST_SUITE_LOCATION) && $(MAKE) && ./t/TEST $(TESTS) + cd $(TEST_SUITE_LOCATION) && $(MAKE) && ./t/TEST $(TEST_CONFIG) $(TESTS) # Run the Apache::Test suite if it has been configured with --with-test-suite. check: check-$(WITH_TEST_SUITE)