svn commit: r1906480 - in /httpd/httpd/trunk: .travis.yml test/travis_before_linux.sh test/travis_run_linux.sh

[jo...@apache.org]

Author: jorton
Date: Mon Jan  9 09:26:05 2023
New Revision: 1906480

URL: http://svn.apache.org/viewvc?rev=1906480&view=rev
Log:
Prep for GitHub actions: move CPAN handling into test scripts,
don't reference /home/travis directly.

Modified:
    httpd/httpd/trunk/.travis.yml
    httpd/httpd/trunk/test/travis_before_linux.sh
    httpd/httpd/trunk/test/travis_run_linux.sh

Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1906480&r1=1906479&r2=1906480&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Mon Jan  9 09:26:05 2023
@@ -464,15 +464,7 @@ jobs:
     - arch: ppc64le
       env: CONFIG="--enable-mods-shared=reallyall"
 
-# CPAN modules are to be used with the system Perl and always with
-# CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct
-# otherwise.
 before_install:
-  - if [ "$TRAVIS_OS_NAME" = "linux" -a ! -v SKIP_TESTING ]; then
-        if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi;
-        cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib);
-        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https LWP::Protocol::AnyEvent::http ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV FCGI AnyEvent::WebSocket::Client Apache::Test;
-    fi
 
 before_script:
   - ./test/travis_before_${TRAVIS_OS_NAME}.sh

Modified: httpd/httpd/trunk/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1906480&r1=1906479&r2=1906480&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_before_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_before_linux.sh Mon Jan  9 09:26:05 2023
@@ -87,12 +87,27 @@ function install_apx() {
     touch ${prefix}/.revision-is-${revision}
 }
 
-# Allow to load /home/travis/build/apache/httpd/.gdbinit
-echo "add-auto-load-safe-path /home/travis/build/apache/httpd/.gdbinit" >> /home/travis/.gdbinit
+# Allow to load $HOME/build/apache/httpd/.gdbinit
+echo "add-auto-load-safe-path $HOME/build/apache/httpd/.gdbinit" >> $HOME/.gdbinit
 
+# Prepare perl-framework test environment
 if ! test -v SKIP_TESTING; then
+    # Clear CPAN cache if necessary
+    if [ -v CLEAR_CACHE ]; then rm -rf ~/perl5; fi
+    
+    cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
+
+    # CPAN modules are to be used with the system Perl and always with
+    # CC=gcc, e.g. for the CC="gcc -m32" case the builds are not correct
+    # otherwise.
+    CC=gcc cpanm --notest Net::SSL LWP::Protocol::https                 \
+           LWP::Protocol::AnyEvent::http                                \
+           ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV FCGI  \
+           AnyEvent::WebSocket::Client Apache::Test
+
     ### Temporary: purge old svn checkout from the cache
     rm -rf $HOME/root/framework
+
     # Make a shallow clone of httpd-tests git repo.
     git clone --depth=1 https://github.com/apache/httpd-tests.git test/perl-framework
 fi

Modified: httpd/httpd/trunk/test/travis_run_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_run_linux.sh?rev=1906480&r1=1906479&r2=1906480&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_run_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_run_linux.sh Mon Jan  9 09:26:05 2023
@@ -39,6 +39,9 @@ if test ! -v SKIP_TESTING; then
         CONFIG="--with-test-suite=test/perl-framework $CONFIG"
         WITH_TEST_SUITE=1
     fi
+
+    # Use the CPAN environment.
+    eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib)
 fi
 if test -v APR_VERSION; then
     CONFIG="$CONFIG --with-apr=$HOME/root/apr-${APR_VERSION}"