From: Joe Orton Date: Mon, 13 Dec 2021 15:01:53 +0000 (+0000) Subject: Merge r1877122, r1879827 from trunk: X-Git-Tag: candidate-2.4.52-rc1~49 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6368dd06e53c087111ce9865eae46c1347fcad5d;p=thirdparty%2Fapache%2Fhttpd.git Merge r1877122, r1879827 from trunk: Travis docs updates. Test VPATH build in Travis, update docs. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1895892 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/.travis.yml b/.travis.yml index 96fefc645c9..fe249ba4b84 100644 --- a/.travis.yml +++ b/.travis.yml @@ -107,11 +107,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 + 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 142e9d94742..2806a5fafe4 100644 --- a/test/README.travis +++ b/test/README.travis @@ -28,11 +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_LDAP - set for builds with slapd running +* TEST_INSTALL - set for job testing "make install" + +* 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 @@ -54,13 +60,10 @@ 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 - "apt-get install" timeout/fails - workaround by moving apt install to before_script phase? - - t/apache/rwrite.t, t/apache/pass_brigade.t - see msg etc Testing from a Feature Branch ----------------------------- @@ -70,7 +73,7 @@ tested in the same way that trunk is in Travis, so this workflow is available for those familiar with using Subversion and the standard ASF/httpd repository layout. -Tested branches are listed at: https://travis-ci.org/apache/httpd/branches +Tested branches are listed at: https://travis-ci.org/github/apache/httpd/branches Travis will also run the tests for a PR filed against the httpd Github repository at https://github.com/apache/httpd or from a fork of this @@ -97,7 +100,7 @@ https://github.com/apache/httpd/compare/trunk...$USERNAME:trunk Once a PR has been created, travis will run the tests and link the results from a PR comment. All tested PRs are listed here: -https://travis-ci.org/apache/httpd/pull_requests +https://travis-ci.org/github/apache/httpd/pull_requests To merge from github back to SVN trunk, create a patch from e.g.: diff --git a/test/travis_run_linux.sh b/test/travis_run_linux.sh index 009a5e24fd4..626a9d56afe 100755 --- a/test/travis_run_linux.sh +++ b/test/travis_run_linux.sh @@ -51,7 +51,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