reduced OS-X tests as they time out regularly

diff --git a/.travis.yml b/.travis.yml
index 67cb9c7171c88712b59d16497d02f0f262505963..4f14407be6c5cc0fe895633895b13abdb17e675e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,8 @@ dist: trusty
 matrix:
   include:
     # Ubuntu 14.04
+    - env: Cmd="make gnu90build && make clean && make cmakebuild && make clean && make travis-install"
+
     - env: Cmd='make gcc6install && CC=gcc-6 make clean uasan-test'
     - env: Cmd='make gcc6install libc6install && CC=gcc-6 make clean uasan-test32'
     - env: Cmd='make clang38install && CC=clang-3.8 make clean msan-test'
@@ -19,15 +21,12 @@ matrix:
 
 
     - env: Cmd='make gpp6install valgrindinstall && make -C zlibWrapper test && make -C zlibWrapper valgrindTest'
-    - env: Cmd='make -C tests versionsTest'
-    - env: Cmd='make gpp6install && cd contrib/pzstd && make test-pzstd && make test-pzstd32 && make test-pzstd-tsan && make test-pzstd-asan'
-      install:
-        - export CXX="g++-6" CC="gcc-6"
     - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zstd-nolegacy'
     - env: Cmd='make gcc6install && CC=gcc-6 make uasan-test-zbuff'
+    - env: Cmd='make -C tests versionsTest'
 
     # OS X Mavericks
-    - env: Cmd="make gnu90build && make clean && make test && make clean && make cmakebuild && make travis-install"
+    - env: Cmd="make test"
       os: osx
 
 before_install: