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

diff --git a/.travis.yml b/.travis.yml
index 340321f59d3233502400fcdfcfa9b3cfc25eca48..e6ad74c991935fbca7163b8d1022afcb6a9e1f34 100644 (file)
--- 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 85afa96182afd8d54e72e1e9d67689f76c296760..9a35affead8d7733fb0014cbc739b71a0f1aa8fe 100755 (executable)
--- 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