From: Yann Collet <cyan@fb.com>
Date: Mon, 24 Dec 2018 11:44:57 +0000 (-0800)
Subject: master branch selector
X-Git-Tag: v1.3.8~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66b21b6c3e3fb50eb24072eef2449a5322737314;p=thirdparty%2Fzstd.git

master branch selector
---

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