From 0e7a32bcd495e914f82035471fe979a9abbc1815 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 29 Feb 2024 14:11:49 +0000 Subject: [PATCH] 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 --- test/travis_run_linux.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 48b8b779db9..19ccb601b15 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" -- 2.47.2