* Makefile.in (check-all-pytest): New target: run both Python test

  suites via test/run-all-tests.sh against the check/ build tree.
  (PHONY_TARGETS): Add check-pytest and check-all-pytest.

* test/run-all-tests.sh: Document PYHTTPD_CONFIG.

Assisted-by: Claude Sonnet 5 <noreply@anthropic.com>
GitHub: PR #701

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1936870 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index 75605671332423eeb54ea7cecdfea9ace49ea737..92e61dd2166d931ecdace69f950b878505e8f14f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,7 @@ DISTCLEAN_TARGETS  = include/ap_config_auto.h include/ap_config_layout.h \
        build/pkg/pkginfo build/config_vars.sh bsd_converted
 EXTRACLEAN_TARGETS = configure include/ap_config_auto.h.in generated_lists \
        httpd.spec
-PHONY_TARGETS := check check-conf check-dirs check-include unittest-objdir
+PHONY_TARGETS := check check-conf check-dirs check-include check-pytest check-all-pytest unittest-objdir
 
 TESTS =
 TEST_CONFIG =
@@ -495,6 +495,9 @@ check/modules/stamp: build/config_vars.mk
 check-pytest: check-tree check/bin/apachectl check/config.ini check/modules/stamp
        PYHTTPD_CONFIG=$(top_builddir)/check/config.ini $(PYTEST3) $(PYTEST_DIRS)
 
+check-all-pytest: check-tree check/bin/apachectl check/config.ini check/modules/stamp
+       PYHTTPD_CONFIG=$(top_builddir)/check/config.ini $(SHELL) $(top_srcdir)/test/run-all-tests.sh --apxs "$(top_builddir)/check/bin/apxs"
+
 # Runs all configured/available test targets.
 check: $(CHECK_TARGETS)
 

diff --git a/test/run-all-tests.sh b/test/run-all-tests.sh
index 71625c7138b14a0fb3351ab62ca08e729f000420..0249aa0f22ff1e083a90741d184faefd428d55f4 100755 (executable)
--- a/test/run-all-tests.sh
+++ b/test/run-all-tests.sh
@@ -55,6 +55,10 @@ The pyhttpd suite selects tests via PYHTTPD_TARGETS or auto-detection.
 Environment:
   APXS             path to apxs (default: config.ini, then \$PATH)
   PHP_FPM          path to php-fpm for PHP tests in pytest_suite (optional)
+  PYHTTPD_CONFIG   path to config.ini for the pyhttpd suite (default:
+                   pyhttpd/config.ini's own --prefix path, which may not be
+                   \`make install\`ed -- e.g. \`make check-all-pytest\` exports
+                   this pointing at check/config.ini)
   PYHTTPD_TARGETS  space-separated list of pyhttpd test paths (default: modules/*)
 EOF
 }