From: Joe Orton <jorton@apache.org>
Date: Fri, 8 Nov 2019 07:45:55 +0000 (+0000)
Subject: Support 2.4.x builds, which lacks --with-test-suite support.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1815
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c096af4bcc808ac025cb1f9d58eacc5701b3bd68;p=thirdparty%2Fapache%2Fhttpd.git

Support 2.4.x builds, which lacks --with-test-suite support.
Build with --enable-load-all-modules only when the test suite is run.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1869527 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.travis.yml b/.travis.yml
index 9604140a1c5..deb56ffb09d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,27 +23,27 @@ matrix:
     - name: Linux Ubuntu, Default module set
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Default, all-modules
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
+      env: CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Prefork MPM, all-modules
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --with-mpm=prefork"
+      env: CONFIG="--enable-mods-shared=reallyall --with-mpm=prefork"
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Worker MPM, all-modules
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --with-mpm=worker"
+      env: CONFIG="--enable-mods-shared=reallyall --with-mpm=worker"
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu Bionic, all-modules
       os: linux
       dist: bionic
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules"
+      env: CONFIG="--enable-mods-shared=reallyall"
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu Bionic, GCC 7 maintainer-mode w/-Werror
       os: linux
       dist: bionic
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-7"
            SKIP_TESTING=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, GCC 8 maintainer-mode w/-Werror
-      env: CONFIG="--enable-mods-shared=reallyall --enable-load-all-modules --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode NOTEST_CFLAGS=-Werror CC=gcc-8"
            SKIP_TESTING=1
       addons:
         apt:
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 55087403b3f..06f50eb1b24 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -1,6 +1,25 @@
 #!/bin/bash -ex
-./buildconf
-test -v SKIP_TESTING || CONFIG="--with-test-suite=test/perl-framework $CONFIG"
+./buildconf --with-apr=/usr/bin/apr-1-config
+# 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
+    CONFIG="$CONFIG --enable-load-all-modules"
+    if grep -q ^check: Makefile.in; then
+        CONFIG="--with-test-suite=test/perl-framework $CONFIG"
+        WITH_TEST_SUITE=1
+    else
+        CONFIG="--prefix=$HOME/build/httpd-root $CONFIG"
+    fi
+fi
 ./configure $CONFIG --with-apr=/usr --with-apr-util=/usr
 make $MAKEFLAGS -j2
-test -v SKIP_TESTING || make check
+if ! test -v SKIP_TESTING; then
+    if test -v WITH_TEST_SUITE; then
+        make check
+    else
+        make install
+        cd test/perl-framework
+        perl Makefile.PL -apxs $HOME/build/httpd-root/bin/apxs
+        make test
+    fi
+fi