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 11:02:16 UTC
svn commit: r1869541 - /httpd/httpd/trunk/test/travis_run_linux.sh
Author: jorton
Date: Fri Nov 8 11:02:16 2019
New Revision: 1869541
URL: http://svn.apache.org/viewvc?rev=1869541&view=rev
Log:
Run buildconf using the specific APR/APR-util versions if configured.
Modified:
httpd/httpd/trunk/test/travis_run_linux.sh
Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1869541&r1=1869540&r2=1869541&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Fri Nov 8 11:02:16 2019
@@ -1,5 +1,10 @@
#!/bin/bash -ex
-./buildconf --with-apr=/usr/bin/apr-1-config
+if test -v APR_VERSION -a -v APU_VERSION; then
+ ./buildconf --with-apr=$HOME/root/apr-${APR_VERSION}/bin/apr-1-config \
+ --with-apr-util=$HOME/root/apu-${APU_VERSION}/bin/apu-1-config
+else
+ ./buildconf --with-apr=/usr/bin/apr-1-config
+fi
# 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