You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2019/11/08 07:45:55 UTC
svn commit: r1869527 - in /httpd/httpd/trunk: .travis.yml
test/travis_run_linux.sh
Author: jorton
Date: Fri Nov 8 07:45:55 2019
New Revision: 1869527
URL: http://svn.apache.org/viewvc?rev=1869527&view=rev
Log:
Support 2.4.x builds, which lacks --with-test-suite support.
Build with --enable-load-all-modules only when the test suite is run.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/travis_run_linux.sh
Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1869527&r1=1869526&r2=1869527&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Fri Nov 8 07:45:55 2019
@@ -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:
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869527&r1=1869526&r2=1869527&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Fri Nov 8 07:45:55 2019
@@ -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