From: Joe Orton <jorton@apache.org>
Date: Tue, 3 Mar 2020 11:33:43 +0000 (+0000)
Subject: Switch to using httpd-tests git repo.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1599
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20d26e0c6c8d35edb860b5bd74a54f178130cb83;p=thirdparty%2Fapache%2Fhttpd.git

Switch to using httpd-tests git repo.


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

diff --git a/.travis.yml b/.travis.yml
index 89a3dfc2685..c14a4dde6e4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -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:
diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index 39c8f1c760e..3d9550169da 100755
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -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