CI: re-enable apr caching for TEST_H2, require newer curl for test_h2_601_05

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

diff --git a/test/modules/http2/test_601_h2proxy_twisted.py b/test/modules/http2/test_601_h2proxy_twisted.py
index 224726eca04e740693e775931ea2f2c39b81c3d0..0079aa69853ac9dd00cafc61e4bbd537e08e2ae7 100644 (file)
--- a/test/modules/http2/test_601_h2proxy_twisted.py
+++ b/test/modules/http2/test_601_h2proxy_twisted.py
@@ -62,6 +62,8 @@ class TestH2ProxyTwisted:
         assert r.exit_code == 92 or r.response["status"] == 502
 
     def test_h2_601_05_echo_fail_many(self, env):
+        if not env.curl_is_at_least('8.0.0'):
+            pytest.skip(f'need at least curl v8.0.0 for this')
         count = 200
         fpath = os.path.join(env.gen_dir, "data-100k")
         args = [env.curl, '--parallel', '--parallel-max', '20']

diff --git a/test/travis_before_linux.sh b/test/travis_before_linux.sh
index f5529299cda94997bfc4056f56169ab3011120a1..bc4d65942b3cfa9a9f47f9d696e8fca0f85bbd51 100755 (executable)
--- a/test/travis_before_linux.sh
+++ b/test/travis_before_linux.sh
@@ -71,10 +71,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, reset
-    if test -v TEST_H2; then
-      rm -rf ${prefix}
-    fi
 
     if test -d ${prefix}; then
         return 0