From: Joe Orton <jorton@apache.org>
Date: Mon, 30 Dec 2019 11:26:21 +0000 (+0000)
Subject: Work around a build failure when a cached APR branch install
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1734
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a604fac5d90421857e5b013f76444377392b412d;p=thirdparty%2Fapache%2Fhttpd.git

Work around a build failure when a cached APR branch install
is used but APR-util needs to be rebuilt; currently this fails
because the APR build directory is not available.

e.g. https://travis-ci.org/apache/httpd/jobs/630885203

Disable caching for this combination for now.


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

diff --git a/.travis.yml b/.travis.yml
index ee9fd4eb06b..6efe8830d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -120,6 +120,7 @@ matrix:
       env: APR_VERSION=1.7.x APU_VERSION=1.7.x
            CONFIG="--enable-mods-shared=reallyall"
            APU_CONFIG="--with-crypto"
+           CLEAR_CACHE=1
     # -------------------------------------------------------------------------
     - name: Linux Ubuntu, APR 1.7.0 --enable-pool-debug, APR-util 1.6.1
       env: APR_VERSION=1.7.0 APR_CONFIG="--enable-pool-debug"
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index f653bcc91c3..8e41ee38bf5 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -1,5 +1,9 @@
 #!/bin/bash -xe
 
+if test -v CLEAR_CACHE; then
+    rm -rf $HOME/root
+fi
+
 # Use a rudimental retry workflow as workaround to svn export hanging for minutes.
 # Travis automatically kills a build if one step takes more than 10 minutes without
 # reporting any progress.