svn commit: r1936870 - in httpd/httpd/trunk: . test

Author: jorton
Date: Tue Aug  4 14:52:29 2026
New Revision: 1936870

Log:
* 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 <[email protected]>
GitHub: PR #701

Modified:
   httpd/httpd/trunk/Makefile.in
   httpd/httpd/trunk/test/run-all-tests.sh

Modified: httpd/httpd/trunk/Makefile.in
==============================================================================
--- httpd/httpd/trunk/Makefile.in	Tue Aug  4 14:51:57 2026	(r1936869)
+++ httpd/httpd/trunk/Makefile.in	Tue Aug  4 14:52:29 2026	(r1936870)
@@ -34,7 +34,7 @@ DISTCLEAN_TARGETS  = include/ap_config_a
 	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.m
 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)
 

Modified: httpd/httpd/trunk/test/run-all-tests.sh
==============================================================================
--- httpd/httpd/trunk/test/run-all-tests.sh	Tue Aug  4 14:51:57 2026	(r1936869)
+++ httpd/httpd/trunk/test/run-all-tests.sh	Tue Aug  4 14:52:29 2026	(r1936870)
@@ -55,6 +55,10 @@ The pyhttpd suite selects tests via PYHT
 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
 }