From 7d51e1a5ec187992a8a0b8e52af3174d9fc1ff06 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Mon, 24 Dec 2018 04:15:41 -0800
Subject: [PATCH] push more tests to master

to reduce test time for dev
---
 .travis.yml | 70 ++++++++++++++++++++++++-----------------------------
 1 file changed, 32 insertions(+), 38 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index efcd18532..3ad59d2b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,29 +31,26 @@ matrix:
       script:
         - make test
 
-    - name: Trusty (gcc-6 + ASan + UBSan + Test Zstd)
+    - name: gcc-6 + gcc-7 compilation
       script:
-        - make gcc6install
+        - make gcc6install gcc7install
         - CC=gcc-6 CFLAGS=-Werror make -j all
         - make clean
-        - CC=gcc-6 make -j uasan-test-zstd </dev/null   # test when stdin is not a tty
+        - CC=gcc-7 CFLAGS=-Werror make -j all
 
-    - name: Trusty (gcc-6 + ASan + UBSan + Test Zstd 32bit)
+    - name: gcc-8 + ASan + UBSan + Test Zstd
       script:
-        - make gcc6install libc6install
+        - make gcc8install
+        - CC=gcc-8 CFLAGS="-Werror" make -j all
         - make clean
-        - CC=gcc-6 make -j uasan-test-zstd32
+        - CC=gcc-8 make -j uasan-test-zstd </dev/null   # test when stdin is not a tty
 
-    - name: Trusty (gcc-7 + ASan + UBSan + Test Zstd)
+    - name: gcc-6 + ASan + UBSan + Test Zstd, 32bit mode
       script:
-        - make gcc7install
+        - make gcc6install libc6install
+        - CC=gcc-6 CFLAGS="-Werror -m32" make -j all32
         - make clean
-        - CC=gcc-7 make -j uasan-test-zstd
-
-    - name: Trusty (gcc-8)
-      script:
-        - make gcc8install
-        - CC=gcc-8 CFLAGS="-Werror -O3" make -j all
+        - CC=gcc-6 make -j uasan-test-zstd32   # note : can complain about pointer overflow
 
     - name: Trusty (clang-3.8 + MSan + Test Zstd)
       script:
@@ -83,27 +80,21 @@ matrix:
       script:
         - make staticAnalyze
 
-    - name: Trusty (gcc-6 + ASan + UBSan + Fuzz Test)
+    - name: Trusty (gcc-8 + ASan + UBSan + Fuzz Test)
       script:
-        - make gcc6install
-        - CC=gcc-6 make clean uasan-fuzztest
+        - make gcc8install
+        - CC=gcc-8 make clean uasan-fuzztest
 
     - name: Trusty (gcc-6 + ASan + UBSan + Fuzz Test 32bit)
       script:
         - make gcc6install libc6install
-        - make clean
-        - CC=gcc-6 CFLAGS=-m32 make uasan-fuzztest
+        - CC=gcc-6 CFLAGS="-O2 -m32" make uasan-fuzztest   # can complain about pointer overflow
 
     - name: Trusty (clang-3.8 + MSan + Fuzz Test)
       script:
         - make clang38install
         - CC=clang-3.8 make clean msan-fuzztest
 
-    - name: Trusty (clang-3.8 + TSan + Fuzz Test)
-      script:
-        - make clang38install
-        - CC=clang-3.8 make clean tsan-fuzztest
-
     - name: Trusty (ASan + UBSan + MSan + Regression Test)
       script:
         - make -j uasanregressiontest
@@ -133,20 +124,6 @@ matrix:
         - make ppcinstall
         - make ppcfuzz
 
-    - name: Trusty (PPC64 + Fuzz Test)
-      script:
-        - make ppcinstall
-        - make ppc64fuzz
-
-    - name: Trusty (LZ4)
-      script:
-        - make lz4install
-        - make -C tests test-lz4
-        - make clean
-        - make -C tests test-pool
-        - make clean
-        - bash tests/libzstd_partial_builds.sh
-
     # check release number
     - name: Tag-Specific Test
       if: tag =~ ^v[0-9]\.[0-9]
@@ -166,6 +143,7 @@ matrix:
       script:
         - make clang38install
         - CC=clang-3.8 make tsan-test-zstream
+        - CC=clang-3.8 make tsan-fuzztest
 
     - name: C++ and gnu90 compatibility
       if: branch = master
@@ -176,6 +154,12 @@ matrix:
         - make clean
         - make travis-install    # just ensures `make install` works
 
+    - name: PPC64
+      if: branch = master
+      script:
+        - make ppcinstall
+        - make ppc64fuzz
+
     - name: zlib wrapper test
       if: branch = master
       script:
@@ -183,6 +167,16 @@ matrix:
         - make -C zlibWrapper test
         - make -C zlibWrapper valgrindTest
 
+    - name: LZ4, thread pool, and partial libs tests
+      if: branch = master
+      script:
+        - make lz4install
+        - make -C tests test-lz4
+        - make clean
+        - make -C tests test-pool
+        - make clean
+        - bash tests/libzstd_partial_builds.sh
+
     # meson dedicated test
     - name: Xenial (Meson + clang)
       dist: xenial
-- 
2.47.2