Add simple test for apxs to catch regression in r1872042.

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

diff --git a/.travis.yml b/.travis.yml
index 254de6fac0e228c10c2afc30559d3cd53e9d5149..258f62ce22ca831dd56f1a406e8b45c7892bcabf 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -72,8 +72,9 @@ jobs:
             - libapr1-dev
             - libbrotli-dev:i386
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu, Default, all-modules
+    - name: Linux Ubuntu, Default, all-modules + install
       env: CONFIG="--enable-mods-shared=reallyall"
+           TEST_INSTALL=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Default, all-static modules
       env: CONFIG="--enable-mods-static=reallyall"

diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 8f0a2fc6db15b06c01b58f38561762a02ff0f0d7..f8fd6c5c4ecaacd34c869159cd1a7ea98bb1841a 100755 (executable)
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -2,6 +2,9 @@
 ### Installed apr/apr-util don't include the *.m4 files but the
 ### Debian packages helpfully install them, so use the system APR to buildconf
 ./buildconf --with-apr=/usr/bin/apr-1-config ${BUILDCONFIG}
+
+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
@@ -9,8 +12,6 @@ if test ! -v SKIP_TESTING; then
     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
 if test -v APR_VERSION; then
@@ -23,9 +24,20 @@ if test -v APU_VERSION; then
 else
     CONFIG="$CONFIG --with-apr-util=/usr"
 fi
-./configure $CONFIG
+
+./configure --prefix=$PREFIX $CONFIG
 make $MFLAGS
 
+if test -v TEST_INSTALL; then
+   make install
+   pushd $PREFIX
+     test `./bin/apxs -q PREFIX` = $PREFIX
+     test `$PWD/bin/apxs -q PREFIX` = $PREFIX
+     ./bin/apxs -g -n foobar
+     cd foobar; make
+   popd
+fi
+
 if ! test -v SKIP_TESTING; then
     set +e
 
@@ -43,9 +55,9 @@ if ! test -v SKIP_TESTING; then
         make check TESTS="${TEST_ARGS}"
         RV=$?
     else
-        make install
+        test -v TEST_INSTALL || make install
         pushd test/perl-framework
-            perl Makefile.PL -apxs $HOME/build/httpd-root/bin/apxs
+            perl Makefile.PL -apxs $PREFIX/bin/apxs
             make test APACHE_TEST_EXTRA_ARGS="${TEST_ARGS}"
             RV=$?
         popd