]> git.ipfire.org Git - thirdparty/apache/httpd.git/commitdiff
CI: Build and run the libcheck-based tests.
authorJoe Orton <jorton@apache.org>
Mon, 22 Dec 2025 11:59:10 +0000 (11:59 +0000)
committerJoe Orton <jorton@apache.org>
Mon, 22 Dec 2025 11:59:10 +0000 (11:59 +0000)
Github: closes #590

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

.github/workflows/linux.yml
test/README.ci
test/travis_run_linux.sh

index 771e16526150d5d8b04116d53981da7b7316f2f7..c1cb5e80449ee0af1e59d845ae47c5860b4d8224 100644 (file)
@@ -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
index 4f2c0e37bf7cd78a68072a614c9e8b7138ad7792..7b28d28d8bfcb1a5e157b58dd0a5c656723accfc 100644 (file)
@@ -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")
 
index f98bbbcb21a3a0db9946e0cef9e5662bb355d839..8d74f58d4834dc6b3854b28908198f52759e2440 100755 (executable)
@@ -141,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
@@ -239,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