Skip to content

Commit 3bd14e4

Browse files
committed
fixup
1 parent 4680871 commit 3bd14e4

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

test/travis_run_linux.sh

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,6 @@ if test -v PHP_FPM; then
133133
$PHP_FPM --version
134134
fi
135135

136-
if test -x ./test/httpdunit; then
137-
: Running libcheck-based unit tests.
138-
prove ./test/httpdunit
139-
fi
140-
141136
# Try to keep all potential coredumps from all processes
142137
sudo sysctl -w kernel.core_uses_pid=1 2>/dev/null || true
143138
# Systemd based systems might process core dumps via systemd-coredump.
@@ -146,7 +141,12 @@ sudo sysctl -w kernel.core_pattern=core || true
146141
ulimit -c unlimited 2>/dev/null || true
147142

148143
if ! test -v NO_TEST_FRAMEWORK; then
149-
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
150150
make check TESTS="${TESTS}" TEST_CONFIG="${TEST_ARGS}" | tee test.log
151151
RV=${PIPESTATUS[0]}
152152
# re-run failing tests with -v, avoiding set -e
@@ -244,7 +244,7 @@ if test -v LITMUS -a $RV -eq 0; then
244244
fi
245245

246246
if test -v TEST_CORE -a $RV -eq 0; then
247-
# Run HTTP/2 tests.
247+
# Run core module tests.
248248
MPM=event py.test-3 test/modules/core
249249
RV=$?
250250
fi

0 commit comments

Comments
 (0)