diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-01-02 11:44:58 +0100 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-01-03 18:17:20 +0100 |
| commit | aa8de5d6ee457456ce665282d1bf5d74648683dc (patch) | |
| tree | e0af9401ec211ce38e06f76b588acab22ff201d6 | |
| parent | 36b36ce9886b151129c14e62f248651832bfdb12 (diff) | |
| download | curl-aa8de5d6ee457456ce665282d1bf5d74648683dc.tar.gz | |
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
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | scripts/travis/script.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index 07d857d92..69e9b6887 100644 --- 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 7c21b1477..26d5aaaf0 100755 --- 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 |