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/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") diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index f98bbbcb21a..8d74f58d483 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -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