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
- fix capturing specific perl-framework failures with "TEST -v" mode


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1916055 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Joe Orton
2024-02-29 14:00:55 +00:00
parent 3736c7a450
commit a1f6da9855
2 changed files with 4 additions and 8 deletions

View File

@ -42,11 +42,6 @@ function install_apx() {
# Blow away the cached install root if the cached install is stale
# or doesn't match the expected configuration.
grep -q "${version} ${revision} ${config} CC=$CC" ${HOME}/root/.key-${name} || rm -rf ${prefix}
# TEST_H2 APR cache seems to be broken, do not use.
# Unknown why this happens on this CI job only and how to fix it
if test -v TEST_H2; then
rm -rf ${prefix}
fi
if test -d ${prefix}; then
return 0
@ -66,8 +61,9 @@ function install_apx() {
# Allow to load $HOME/build/apache/httpd/.gdbinit
echo "add-auto-load-safe-path $HOME/work/httpd/httpd/.gdbinit" >> $HOME/.gdbinit
# Prepare perl-framework test environment
if ! test -v SKIP_TESTING; then
# Unless either SKIP_TESTING or NO_TEST_FRAMEWORK are set, install
# CPAN modules required to run the Perl test framework.
if ! test -v SKIP_TESTING -o -v NO_TEST_FRAMEWORK; then
# Clear CPAN cache if necessary
if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi

View File

@ -136,7 +136,7 @@ if ! test -v NO_TEST_FRAMEWORK; then
FAILERS="$FAILERS $FAILER"
done < <(awk '/Failed:/{print $1}' test.log)
if [ -n "$FAILERS" ]; then
t/TEST -v $FAILERS || true
make check TESTS="-v $FAILERS" || true
fi
# set -e would have killed us after the original t/TEST
rm -f test.log