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

[jo...@apache.org]

Author: jorton
Date: Tue Mar  3 11:33:43 2020
New Revision: 1874716

URL: http://svn.apache.org/viewvc?rev=1874716&view=rev
Log:
Switch to using httpd-tests git repo.

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

Modified: httpd/httpd/trunk/.travis.yml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/.travis.yml?rev=1874716&r1=1874715&r2=1874716&view=diff
==============================================================================
--- httpd/httpd/trunk/.travis.yml (original)
+++ httpd/httpd/trunk/.travis.yml Tue Mar  3 11:33:43 2020
@@ -228,7 +228,7 @@ matrix:
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then
         cpanm --local-lib=~/perl5 local::lib && eval $(perl -I ~/perl5/lib/perl5/ -Mlocal::lib);
-        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI;
+        CC=gcc cpanm --notest Net::SSL LWP::Protocol::https ExtUtils::Embed Test::More AnyEvent DateTime HTTP::DAV Protocol::HTTP2::Client FCGI Apache::Test;
     fi
 
 before_script:

Modified: httpd/httpd/trunk/test/travis_before_linux.sh
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/test/travis_before_linux.sh?rev=1874716&r1=1874715&r2=1874716&view=diff
==============================================================================
--- httpd/httpd/trunk/test/travis_before_linux.sh (original)
+++ httpd/httpd/trunk/test/travis_before_linux.sh Tue Mar  3 11:33:43 2020
@@ -72,23 +72,10 @@ function install_apx() {
 
 
 if ! test -v SKIP_TESTING; then
-    # The test/framework checkout is cached at ~/root/framework, which
-    # is copied to test/framework within the httpd build directory.
-    # Renew the cache here if the last-changed revision is stale.
-    framework=https://svn.apache.org/repos/asf/httpd/test/framework/trunk
-    fcache=$HOME/root/framework
-    frev=`svn info --no-newline --show-item last-changed-revision ${framework}`
-    if [ -d ${fcache} -a ! -f ${fcache}/.revision-is-${frev} ]; then
-        : Purging stale cache at ${fcache}
-        rm -rf ${fcache}
-    fi
-
-    if [ ! -d ${fcache} ]; then
-        run_svn_export ${framework} ${frev} ${fcache} 5
-        touch ${fcache}/.revision-is-${frev}
-    fi
-
-    cp -a ${fcache} test/perl-framework
+    ### 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
 
 if test -v APR_VERSION; then