diff options
| author | Joe Orton <jorton@apache.org> | 2024-02-29 15:11:49 +0100 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2024-02-29 15:11:49 +0100 |
| commit | 0e7a32bcd495e914f82035471fe979a9abbc1815 (patch) | |
| tree | 5e6ce783447b6d34ff0479b352d6db496c158868 | |
| parent | CI tweaks: (diff) | |
| download | apache2-0e7a32bcd495e914f82035471fe979a9abbc1815.tar.xz apache2-0e7a32bcd495e914f82035471fe979a9abbc1815.zip | |
Fix regression in r1916055 - don't duplicate logic in _run_linux.sh
from _before_linux.sh in whether the perl-framework is used/needed.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916056 13f79535-47bb-0310-9956-ffa450edef68
| -rwxr-xr-x | test/travis_run_linux.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 48b8b779db..19ccb601b1 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -31,9 +31,9 @@ fi PREFIX=${PREFIX:-$HOME/build/httpd-root} -# For trunk, "make check" is sufficient to run the test suite. -# For 2.4.x, the test suite must be run manually -if test ! -v SKIP_TESTING; then +# If perl-framework testing is required it is checked out here by +# _before_linux.sh: +if test -d test/perl-framework; then CONFIG="$CONFIG --enable-load-all-modules" if grep -q ^check: Makefile.in; then CONFIG="--with-test-suite=test/perl-framework $CONFIG" |