From 81dab45b12fccd61fdd7cf184321aa754caefb81 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Mon, 24 Dec 2018 03:31:40 -0800
Subject: [PATCH 1/3] added master tests

---
 .travis.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index a2f315bfa..738133ccb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -147,12 +147,39 @@ matrix:
         - make clean
         - bash tests/libzstd_partial_builds.sh
 
+    # check release number
     - name: Tag-Specific Test
       if: tag =~ ^v[0-9]\.[0-9]
       script:
         - make -C tests checkTag
         - tests/checkTag "$TRAVIS_BRANCH"
 
+    # tests for master branch and cron job only
+    - name: OS-X
+      os: osx
+      script:
+        - make test
+
+    - name: thread sanitizer
+      script:
+        - make clang38install
+        - CC=clang-3.8 make tsan-test-zstream
+
+    - name: port tests
+      script:
+        - make cxxtest
+        - make clean
+        - make gnu90build
+        - make clean
+        - make travis-install
+
+    - name: zlib wrapper test
+      script:
+        - make gpp6install valgrindinstall
+        - make -C zlibWrapper test
+        - make -C zlibWrapper valgrindTest
+
+    # meson dedicated test
     - name: Xenial (Meson + clang)
       dist: xenial
       language: cpp

From 66b21b6c3e3fb50eb24072eef2449a5322737314 Mon Sep 17 00:00:00 2001
From: Yann Collet <cyan@fb.com>
Date: Mon, 24 Dec 2018 03:44:57 -0800
Subject: [PATCH 2/3] master branch selector

---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 738133ccb..efcd18532 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -156,24 +156,28 @@ matrix:
 
     # tests for master branch and cron job only
     - name: OS-X
+      if: branch = master
       os: osx
       script:
         - make test
 
     - name: thread sanitizer
+      if: branch = master
       script:
         - make clang38install
         - CC=clang-3.8 make tsan-test-zstream
 
-    - name: port tests
+    - name: C++ and gnu90 compatibility
+      if: branch = master
       script:
         - make cxxtest
         - make clean
         - make gnu90build
         - make clean
-        - make travis-install
+        - make travis-install    # just ensures `make install` works
 
     - name: zlib wrapper test
+      if: branch = master
       script:
         - make gpp6install valgrindinstall
         - make -C zlibWrapper test

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 3/3] push more tests to master

to reduce test time for dev
---
 .travis.yml | 76 ++++++++++++++++++++++++-----------------------------
 1 file changed, 35 insertions(+), 41 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)
-      script:
-        - make gcc6install libc6install
-        - make clean
-        - CC=gcc-6 make -j uasan-test-zstd32
-
-    - name: Trusty (gcc-7 + ASan + UBSan + Test Zstd)
-      script:
-        - make gcc7install
-        - make clean
-        - CC=gcc-7 make -j uasan-test-zstd
-
-    - name: Trusty (gcc-8)
+    - name: gcc-8 + ASan + UBSan + Test Zstd
       script:
         - make gcc8install
-        - CC=gcc-8 CFLAGS="-Werror -O3" make -j all
+        - CC=gcc-8 CFLAGS="-Werror" make -j all
+        - make clean
+        - CC=gcc-8 make -j uasan-test-zstd </dev/null   # test when stdin is not a tty
+
+    - name: gcc-6 + ASan + UBSan + Test Zstd, 32bit mode
+      script:
+        - make gcc6install libc6install
+        - CC=gcc-6 CFLAGS="-Werror -m32" make -j all32
+        - make clean
+        - 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