From 4680871bba2cb1a14d62831472fd43d2a56dee5a Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Mon, 22 Dec 2025 11:28:50 +0000
Subject: [PATCH 1/3] CI: Build and run the libcheck-based tests.

---
 .github/workflows/linux.yml | 2 +-
 test/travis_run_linux.sh    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index 771e1652615..c1cb5e80449 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -353,7 +353,7 @@ jobs:
                     cpanminus libtool-bin libapr1-dev libaprutil1-dev
                     liblua5.3-dev libbrotli-dev libcurl4-openssl-dev     
                     libnghttp2-dev libjansson-dev libpcre2-dev gdb
-                    perl-doc libsasl2-dev ${{ matrix.pkgs }}
+                    perl-doc libsasl2-dev ${{ matrix.pkgs }} check
     - uses: actions/checkout@v4
     - name: Cache installed libraries
       uses: actions/cache@v4
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index f98bbbcb21a..cd921a5f4ca 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -133,6 +133,11 @@ if test -v PHP_FPM; then
     $PHP_FPM --version
 fi
 
+if test -x ./test/httpdunit; then
+    : Running libcheck-based unit tests.
+    prove ./test/httpdunit
+fi
+
 # Try to keep all potential coredumps from all processes
 sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
 # Systemd based systems might process core dumps via systemd-coredump.

From 3bd14e45fbb162e77eed4cd8aebc60620e5233ee Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Mon, 22 Dec 2025 11:41:39 +0000
Subject: [PATCH 2/3] fixup

---
 test/travis_run_linux.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index cd921a5f4ca..8d74f58d483 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -133,11 +133,6 @@ if test -v PHP_FPM; then
     $PHP_FPM --version
 fi
 
-if test -x ./test/httpdunit; then
-    : Running libcheck-based unit tests.
-    prove ./test/httpdunit
-fi
-
 # Try to keep all potential coredumps from all processes
 sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
 # Systemd based systems might process core dumps via systemd-coredump.
@@ -146,7 +141,12 @@ sudo sysctl -w kernel.core_pattern=core || true
 ulimit -c unlimited 2>/dev/null || true
 
 if ! test -v NO_TEST_FRAMEWORK; then
-    if test -v WITH_TEST_SUITE; then
+    : Running libcheck-based unit tests.
+    if ! prove -v ./test/httpdunit; then
+        RV=1
+    fi
+
+    if test -v WITH_TEST_SUITE -a $RV -eq 0; then
         make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}" | tee test.log
         RV=${PIPESTATUS[0]}
         # re-run failing tests with -v, avoiding set -e
@@ -244,7 +244,7 @@ if test -v LITMUS -a $RV -eq 0; then
 fi
 
 if test -v TEST_CORE -a $RV -eq 0; then
-    # Run HTTP/2 tests.
+    # Run core module tests.
     MPM=event py.test-3 test/modules/core
     RV=$?
 fi

From 38325e9463505b8a90820cf53c0d20da1fa87d28 Mon Sep 17 00:00:00 2001
From: Joe Orton <jorton@redhat.com>
Date: Mon, 22 Dec 2025 11:42:35 +0000
Subject: [PATCH 3/3] amend docs. [skip ci]

---
 test/README.ci | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/README.ci b/test/README.ci
index 4f2c0e37bf7..7b28d28d8bf 100644
--- a/test/README.ci
+++ b/test/README.ci
@@ -26,7 +26,8 @@ The CI scripts use the following environment variables:
 
 * SKIP_TESTING - if set, no testing is done at all
 
-* NO_TEST_FRAMEWORK - if set, the Perl test framework is not used
+* NO_TEST_FRAMEWORK - if set, the Perl-based test framework and
+                      libcheck-based unit tests are skipped
 
 * TEST_UBSAN - set for job using UBSan ("Undefined Behaviour Sanitizer")