From 743ab72bf11a26275e98264b1bcec7b912aee395 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 11 Mar 2021 16:18:53 +0100 Subject: [PATCH] travis: split "torture" into a separate "events" build as well Run torture without FTP and reducing coverage to 20% For some reason the torture tests now run a lot slower on travis and run into the 50 minute limit all the time. Closes #6728 --- .travis.yml | 13 +++++++++++++ scripts/travis/script.sh | 8 +++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 340321f59..e6ad74c99 100644 --- a/.travis.yml +++ b/.travis.yml @@ -298,6 +298,19 @@ jobs: - libbrotli-dev - libzstd-dev - libssh2-1-dev + - env: + - T=events + - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" + addons: + apt: + <<: *common_apt + packages: + - *common_packages + - lcov + - libpsl-dev + - libbrotli-dev + - libzstd-dev + - libssh2-1-dev - env: - T=distcheck - OVERRIDE_CC="CC=gcc-8" OVERRIDE_CXX="CXX=g++-8" diff --git a/scripts/travis/script.sh b/scripts/travis/script.sh index 85afa9618..9a35affea 100755 --- a/scripts/travis/script.sh +++ b/scripts/travis/script.sh @@ -36,11 +36,17 @@ if [ "$T" = "coverage" ]; then fi if [ "$T" = "torture" ]; then + ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 + make + tests="!TLS-SRP !FTP" + make "TFLAGS=-n --shallow=20 -t $tests" test-nonflaky +fi + +if [ "$T" = "events" ]; then ./configure --enable-debug --disable-shared --disable-threaded-resolver --enable-code-coverage --enable-werror --with-libssh2 make tests="!TLS-SRP" make "TFLAGS=-n -e $tests" test-nonflaky - make "TFLAGS=-n --shallow=40 -t $tests" test-nonflaky fi if [ "$T" = "debug" ]; then