Skip to content

Commit 0e6b5ab

Browse files
committed
CI tweaks:
- don't install CPAN modules if NO_TEST_FRAMEWORK is set - remove the workaround for mod_h2 APR build caching which should no longer be necessary now caching is fixed git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916055 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit a1f6da9)
1 parent c1f5bc3 commit 0e6b5ab

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

test/travis_before_linux.sh

+3-7
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@ function install_apx() {
7171
# Blow away the cached install root if the cached install is stale
7272
# or doesn't match the expected configuration.
7373
grep -q "${version} ${revision} ${config} CC=$CC" ${HOME}/root/.key-${name} || rm -rf ${prefix}
74-
# TEST_H2 APR cache seems to be broken, do not use.
75-
# Unknown why this happens on this CI job only and how to fix it
76-
if test -v TEST_H2; then
77-
rm -rf ${prefix}
78-
fi
7974

8075
if test -d ${prefix}; then
8176
return 0
@@ -95,8 +90,9 @@ function install_apx() {
9590
# Allow to load $HOME/build/apache/httpd/.gdbinit
9691
echo "add-auto-load-safe-path $HOME/work/httpd/httpd/.gdbinit" >> $HOME/.gdbinit
9792

98-
# Prepare perl-framework test environment
99-
if ! test -v SKIP_TESTING; then
93+
# Unless either SKIP_TESTING or NO_TEST_FRAMEWORK are set, install
94+
# CPAN modules required to run the Perl test framework.
95+
if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
10096
# Clear CPAN cache if necessary
10197
if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi
10298

0 commit comments

Comments
 (0)