Skip to content

Commit 806e1f3

Browse files
committed
CI: Build and run the libcheck-based tests.
Github: closes #590 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1930795 13f79535-47bb-0310-9956-ffa450edef68
1 parent f718bc3 commit 806e1f3

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

.github/workflows/linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ jobs:
353353
cpanminus libtool-bin libapr1-dev libaprutil1-dev
354354
liblua5.3-dev libbrotli-dev libcurl4-openssl-dev
355355
libnghttp2-dev libjansson-dev libpcre2-dev gdb
356-
perl-doc libsasl2-dev ${{ matrix.pkgs }}
356+
perl-doc libsasl2-dev ${{ matrix.pkgs }} check
357357
- uses: actions/checkout@v4
358358
- name: Cache installed libraries
359359
uses: actions/cache@v4

test/README.ci

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,8 @@ The CI scripts use the following environment variables:
2626

2727
* SKIP_TESTING - if set, no testing is done at all
2828

29-
* NO_TEST_FRAMEWORK - if set, the Perl test framework is not used
29+
* NO_TEST_FRAMEWORK - if set, the Perl-based test framework and
30+
libcheck-based unit tests are skipped
3031

3132
* TEST_UBSAN - set for job using UBSan ("Undefined Behaviour Sanitizer")
3233

test/travis_run_linux.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,12 @@ sudo sysctl -w kernel.core_pattern=core || true
141141
ulimit -c unlimited 2>/dev/null || true
142142

143143
if ! test -v NO_TEST_FRAMEWORK; then
144-
if test -v WITH_TEST_SUITE; then
144+
: Running libcheck-based unit tests.
145+
if ! prove -v ./test/httpdunit; then
146+
RV=1
147+
fi
148+
149+
if test -v WITH_TEST_SUITE -a $RV -eq 0; then
145150
make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}" | tee test.log
146151
RV=${PIPESTATUS[0]}
147152
# re-run failing tests with -v, avoiding set -e
@@ -239,7 +244,7 @@ if test -v LITMUS -a $RV -eq 0; then
239244
fi
240245

241246
if test -v TEST_CORE -a $RV -eq 0; then
242-
# Run HTTP/2 tests.
247+
# Run core module tests.
243248
MPM=event py.test-3 test/modules/core
244249
RV=$?
245250
fi

0 commit comments

Comments
 (0)