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 2020/07/13 14:02:39 UTC
svn commit: r1879827 - in /httpd/httpd/trunk: .travis.yml test/README.travis
test/travis_run_linux.sh
Author: jorton
Date: Mon Jul 13 14:02:39 2020
New Revision: 1879827
URL: http://svn.apache.org/viewvc?rev=1879827&view=rev
Log:
Test VPATH build in Travis, update docs.
Modified:
httpd/httpd/trunk/.travis.yml
httpd/httpd/trunk/test/README.travis
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=1879827&r1=1879826&r2=1879827&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Mon Jul 13 14:02:39 2020
@@ -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"
Modified: httpd/httpd/trunk/test/README.travis
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/README.travis?rev=1879827&r1=1879826&r2=1879827&view=diff
==============================================================================
--- httpd/httpd/trunk/test/README.travis (original)
+++ httpd/httpd/trunk/test/README.travis Mon Jul 13 14:02:39 2020
@@ -28,13 +28,17 @@ The Travis scripts use the following env
* 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
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1879827&r1=1879826&r2=1879827&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Mon Jul 13 14:02:39 2020
@@ -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