travis: limit the tests with quiche builds to HTTPS and FTPS only

... since it runs into the 50 minute time limit too often otherwise.

Closes #6403

diff --git a/.travis.yml b/.travis.yml
index 07d857d92f7765d866a8373b006b0b83dc0a6a9e..69e9b68878c401241b48c1757aa6f4376a54b86c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -258,7 +258,7 @@ jobs:
     - T=iconv
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
   - env:
-    - T=cmake BORINGSSL=yes QUICHE=yes C="-GNinja -DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1"
+    - T=cmake BORINGSSL=yes QUICHE=yes C="-GNinja -DUSE_QUICHE=1 -DOPENSSL_ROOT_DIR=$HOME/boringssl -DCURL_BROTLI=1 -DCURL_ZSTD=1" TFLAGS="https ftps"
     - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8"
     - PKG_CONFIG_PATH="$HOME/quiche/target/release"
     before_install:

diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh
index 7c21b1477eec9fdaf769504a27c3a081c220a378..26d5aaaf040dbe9254aeb9ed827a88eba561f602 100755 (executable)
--- a/scripts/travis/script.sh
+++ b/scripts/travis/script.sh
@@ -6,7 +6,7 @@
 #                            | (__| |_| |  _ <| |___
 #                             \___|\___/|_| \_\_____|
 #
-# Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+# Copyright (C) 1998 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
 #
 # This software is licensed as described in the file COPYING, which
 # you should have received as part of this distribution. The terms
@@ -106,7 +106,7 @@ fi
 if [ "$T" = "cmake" ]; then
   cmake -H. -Bbuild -DCURL_WERROR=ON $C
   cmake --build build
-  env TFLAGS="!1139" cmake --build build --target test-nonflaky
+  env TFLAGS="!1139 $TFLAGS" cmake --build build --target test-nonflaky
 fi
 
 if [ "$T" = "distcheck" ]; then