From: Joe Orton <jorton@apache.org>
Date: Mon, 13 Jul 2020 14:02:39 +0000 (+0000)
Subject: Test VPATH build in Travis, update docs.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1269
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef45baa29cd7fa3ef538502b65dd193ce73f8ab2;p=thirdparty%2Fapache%2Fhttpd.git

Test VPATH build in Travis, update docs.


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

diff --git a/.travis.yml b/.travis.yml
index 08ec66f8362..745860a4c9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -106,10 +106,11 @@ jobs:
     - name: Linux Ubuntu, Shared MPMs, all-modules
       env: CONFIG="--enable-mods-shared=reallyall --enable-mpms-shared=all"
     # -------------------------------------------------------------------------
-    - name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror
+    - name: Linux Ubuntu, GCC 7 maintainer-mode w/-Werror, install + VPATH
       os: linux
-      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode" NOTEST_CFLAGS='-Werror -O2' CC=gcc-7
-           SKIP_TESTING=1
+      env: CONFIG="--enable-mods-shared=reallyall --enable-maintainer-mode"
+           NOTEST_CFLAGS='-Werror -O2' CC=gcc-7
+           TEST_VPATH=1 TEST_INSTALL=1 SKIP_TESTING=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, Event MPM, all-modules, mod_cgid only
       env: CONFIG="--enable-mods-shared=reallyall --with-mpm=event --disable-cgi"
diff --git a/test/README.travis b/test/README.travis
index d174cccd086..2806a5fafe4 100644
--- a/test/README.travis
+++ b/test/README.travis
@@ -28,13 +28,17 @@ The Travis scripts use the following environment variables:
 * SKIP_TESTING - if set, the Perl test framework is not run for the
   build.
 
-* TEST_UBSAN - set for builds using UBSan ("Undefined Behaviour Sanitizer")
+* TEST_UBSAN - set for job using UBSan ("Undefined Behaviour Sanitizer")
 
-* TEST_MALLOC - set for builds using enhanced malloc debugging.
+* TEST_MALLOC - set for job using enhanced malloc debugging.
 
-* TEST_INSTALL - set for builds testing "make install"
+* TEST_INSTALL - set for job testing "make install"
 
-* TEST_LDAP - set for builds with slapd running
+* TEST_VPATH - set for job testing srcdir!=builddir 
+
+* TEST_LDAP - set for job with slapd, running LDAP tests
+
+* TEST_SSL - set for job with SSL/TLS testing variants
 
 * TESTS - a list of Perl framework tests to run
 
@@ -56,7 +60,6 @@ TODO list
 * Windows build
 * clang-on-Linux build
 * Use containers for non-Ubuntu-based Linux testing
-* VPATH builds
 * sanity checks for use of APLOGNO() - empty arguments, accidental duplicates, etc.
  - not sure how exactly
 * Known test failures
diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh
index 77dda889dfc..f52b5fd94aa 100755
--- a/test/travis_run_linux.sh
+++ b/test/travis_run_linux.sh
@@ -36,7 +36,14 @@ else
     CONFIG="$CONFIG --with-apr-util=/usr"
 fi
 
-./configure --prefix=$PREFIX $CONFIG
+srcdir=$PWD
+
+if test -v TEST_VPATH; then
+    mkdir ../vpath
+    cd ../vpath
+fi
+
+$srcdir/configure --prefix=$PREFIX $CONFIG
 make $MFLAGS
 
 if test -v TEST_INSTALL; then