Merge remote-tracking branch 'refs/remotes/lz4/dev' into dev

1 files changed, 17 insertions, 89 deletions

diff --git a/.travis.yml b/.travis.yml
index ef8732c..4d6bdc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,57 +4,29 @@ matrix:
   include:
     # OS X Mavericks
     - os: osx
-      env: Ubu="OS X Mavericks" PARAMS='-C tests test-lz4 CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"' COMPILER=clang
+      env: Ubu=OS_X_Mavericks Cmd='make -C tests test-lz4 CC=clang MOREFLAGS="-Werror -Wconversion -Wno-sign-conversion"' COMPILER=clang
+    
     # Container-based 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
     - os: linux
       sudo: false
-      env: Ubu="12.04cont" PARAMS="install PREFIX=~/install_test_dir" COMPILER=cc
+      env: Ubu=12.04cont Cmd="make gpptest && make clean && make examples && make clean && make cmake && make clean && make travis-install" COMPILER=cc
     - os: linux
       sudo: false
-      env: Ubu="12.04cont" PARAMS="examples" COMPILER=cc
+      env: Ubu=12.04cont Cmd='make test' COMPILER=cc
     - os: linux
       sudo: false
-      env: Ubu="12.04cont" PARAMS="cmake" COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS=clangtest COMPILER=clang
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS=gpptest COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-lz4' COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-lz4 MOREFLAGS="-std=c99"' COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-lz4c' COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-fullbench' COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-fuzzer' COMPILER=cc
-    - os: linux
-      sudo: false
-      env: Ubu="12.04cont" PARAMS='-C tests test-frametest' COMPILER=cc
+      env: Ubu=12.04cont Cmd='make clangtest' COMPILER=clang
+    
     # 14.04 LTS Server Edition 64 bit
-    - env: Ubu="14.04" PARAMS=sanitize COMPILER=clang
+    - env: Ubu=14.04 Cmd='make staticAnalyze sanitize' COMPILER=clang
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
             - valgrind
-    - env: Ubu="14.04" PARAMS=staticAnalyze COMPILER=clang
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
             - clang
-    - env: Ubu="14.04" PARAMS=armtest COMPILER=arm-linux-gnueabi-gcc
+    - env: Ubu=14.04 Cmd='make armtest' COMPILER=arm-linux-gnueabi-gcc
       dist: trusty
       sudo: required
       addons:
@@ -63,36 +35,23 @@ matrix:
             - gcc-arm-linux-gnueabi
             - libc6-dev-armel-cross
             - linux-libc-dev-armel-cross
-    - env: Ubu="14.04" PARAMS=versionsTest COMPILER=cc
+    - env: Ubu=14.04 Cmd='make c_standards && make -C tests test-lz4 test-mem' COMPILER=cc
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
-            - python3
-            - libc6-dev-i386
-            - gcc-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4' COMPILER=cc
-      dist: trusty
-      sudo: required
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4c32' COMPILER=cc
+            - valgrind
+    - env: Ubu=14.04 Cmd='make -C tests test32 versionsTest' COMPILER=cc
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
+            - python3
             - libc6-dev-i386
             - gcc-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=gcc-5' COMPILER=gcc-5
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - gcc-5
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4c32 CC=gcc-5' COMPILER=gcc-5
+    - env: Ubu=14.04 Cmd='make -C tests test-lz4 test-lz4c32 CC=gcc-5 MOREFLAGS="-Werror"' COMPILER=gcc-5
       dist: trusty
       sudo: required
       addons:
@@ -104,7 +63,7 @@ matrix:
             - gcc-multilib
             - gcc-5
             - gcc-5-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=gcc-6' COMPILER=gcc-6
+    - env: Ubu=14.04 Cmd='make c_standards CC=gcc-6 && make -C tests test-lz4 CC=gcc-6 MOREFLAGS="-Werror"' COMPILER=gcc-6
       dist: trusty
       sudo: required
       addons:
@@ -113,7 +72,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - gcc-6
-    - env: Ubu="14.04" PARAMS='-C tests test-lz4 CC=clang-3.8' COMPILER=clang-3.8
+    - env: Ubu=14.04 Cmd='make -C tests test-lz4 CC=clang-3.8' COMPILER=clang-3.8
       dist: trusty
       sudo: required
       addons:
@@ -123,39 +82,8 @@ matrix:
             - llvm-toolchain-precise-3.8
           packages:
             - clang-3.8
-    - env: Ubu="14.04" PARAMS='-C tests test-fullbench32' COMPILER=cc
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-fuzzer32' COMPILER=cc
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-frametest32' COMPILER=cc
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - libc6-dev-i386
-            - gcc-multilib
-    - env: Ubu="14.04" PARAMS='-C tests test-mem' COMPILER=cc
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - valgrind
 
 script:
-  - echo PARAMS=$PARAMS
+  - echo Cmd=$Cmd
   - $COMPILER -v
-  - sh -c "make $PARAMS"
+  - sh -c "$Cmd"