Merge pull request #258 from inikep/dev2

Travis tests reduced to 11
2016-11-07 10:30:54 -08:00 · 2016-11-07 10:30:54 -08:00 · 301c4e94ee
commit 301c4e94ee
parent 839085f050 9b3dcb325f
3 changed files with 40 additions and 102 deletions
--- 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,7 +35,14 @@ 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:
+            - valgrind
+    - env: Ubu=14.04 Cmd='make -C tests test32 versionsTest' COMPILER=cc
      dist: trusty
      sudo: required
      addons:
@ -72,27 +51,7 @@ matrix:
            - 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
-      dist: trusty
-      sudo: required
-      addons:
-        apt:
-          packages:
-            - 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"
--- a/24
+++ b/24
@ -85,7 +85,7 @@ uninstall:
 	@$(MAKE) -C $(PRGDIR) $@

 travis-install:
-	sudo $(MAKE) install
+	$(MAKE) install PREFIX=~/install_test_dir

 test:
 	$(MAKE) -C $(TESTDIR) test
@ -96,19 +96,29 @@ cmake:
 gpptest: clean
 	$(MAKE) all CC=g++ CFLAGS="-O3 -I../lib -Wall -Wextra -Wundef -Wshadow -Wcast-align -Werror"

+c_standards: clean
+	$(MAKE) all CFLAGS="-std=gnu90" 
+	$(MAKE) clean
+	$(MAKE) all CFLAGS="-std=c99" 
+	$(MAKE) clean
+	$(MAKE) all CFLAGS="-std=gnu99" 
+	$(MAKE) clean
+	$(MAKE) all CFLAGS="-std=c11" 
+	$(MAKE) clean
+
 clangtest: clean
-	CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" $(MAKE) all CC=clang
+	$(MAKE) all CC=clang CFLAGS="-O3 -Werror -Wconversion -Wno-sign-conversion" 

 sanitize: clean
-	CFLAGS="-O3 -g -fsanitize=undefined" $(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1
+	$(MAKE) test CC=clang FUZZER_TIME="-T1mn" NB_LOOPS=-i1 CFLAGS="-O3 -g -fsanitize=undefined" 

 staticAnalyze: clean
-	CFLAGS=-g scan-build --status-bugs -v $(MAKE) all
+	scan-build --status-bugs -v $(MAKE) all CFLAGS=-g 

 armtest: clean
-	CFLAGS="-O3 -Werror" $(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc
-	CFLAGS="-O3 -Werror" $(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc
-	CFLAGS="-O3 -Werror" $(MAKE) -C $(TESTDIR) bins CC=arm-linux-gnueabi-gcc
+	$(MAKE) -C $(LZ4DIR) all CC=arm-linux-gnueabi-gcc CFLAGS="-O3 -Werror" 
+	$(MAKE) -C $(PRGDIR) bins CC=arm-linux-gnueabi-gcc CFLAGS="-O3 -Werror" 
+	$(MAKE) -C $(TESTDIR) bins CC=arm-linux-gnueabi-gcc CFLAGS="-O3 -Werror" 

 versionsTest: clean
 	$(MAKE) -C $(TESTDIR) $@
--- a/tests/Makefile
+++ b/tests/Makefile
@ -122,9 +122,9 @@ versionsTest:
 #FreeBSD targets
 ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU FreeBSD))

-test: test-lz4 test-lz4c test-fasttest test-frametest test-fullbench test-fuzzer test-mem
+test: test-lz4 test-lz4c test-fasttest test-frametest test-fullbench test-fuzzer

-test32: test-lz4c32 test-frametest32 test-fullbench32 test-fuzzer32 test-mem32
+test32: test-lz4c32 test-frametest32 test-fullbench32 test-fuzzer32

 test-all: test test32