joined arm and aarch64 tests

diff --git a/.travis.yml b/.travis.yml
index 71b8288..1de67aa 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,37 +9,38 @@ matrix:
     # Container-based 12.04 LTS Server Edition 64 bit (doesn't support 32-bit includes)
     - os: linux
       sudo: false
-      env: Ubu=12.04cont Cmd="make gpptest && make clean && make examples && make clean && make cmake && make clean && make travis-install" COMPILER=cc
+      env: Ubu=12.04cont Cmd='make test' COMPILER=cc
+      
     - os: linux
       sudo: false
-      env: Ubu=12.04cont Cmd='make test' 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 Cmd='make clangtest' COMPILER=clang
     
+    
     # 14.04 LTS Server Edition 64 bit
-    - env: Ubu=14.04 Cmd='make staticAnalyze sanitize' COMPILER=clang
+    - env: Ubu=14.04 Cmd='make -C tests test32 versionsTest' COMPILER=cc
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
-            - valgrind
-            - clang
+            - python3
+            - libc6-dev-i386
+            - gcc-multilib
     
-    - env: Ubu=14.04 Cmd='make platformTest CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static' COMPILER=arm-linux-gnueabi-gcc
+    - env: Ubu=14.04 Cmd='make staticAnalyze sanitize' COMPILER=clang
       dist: trusty
       sudo: required
       addons:
         apt:
           packages:
-            - qemu-system-arm
-            - qemu-user-static
-            - gcc-arm-linux-gnueabi
-            - libc6-dev-armel-cross
-            - linux-libc-dev-armel-cross
+            - valgrind
+            - clang
     
-    - env: Ubu=14.04 Cmd='make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static' COMPILER=aarch64-linux-gnu-gcc
+    - env: Ubu=14.04 Cmd='make platformTest CC=arm-linux-gnueabi-gcc QEMU_SYS=qemu-arm-static && make platformTest CC=aarch64-linux-gnu-gcc QEMU_SYS=qemu-aarch64-static' COMPILER=arm-linux-gnueabi-gcc
       dist: trusty
       sudo: required
       addons:
@@ -47,6 +48,8 @@ matrix:
           packages:
             - qemu-system-arm
             - qemu-user-static
+            - gcc-arm-linux-gnueabi
+            - libc6-dev-armel-cross 
             - gcc-aarch64-linux-gnu
             - libc6-dev-arm64-cross
     
@@ -67,15 +70,7 @@ matrix:
         apt:
           packages:
             - 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 Cmd='make -C tests test-lz4 test-lz4c32 CC=gcc-5 MOREFLAGS=-Werror' COMPILER=gcc-5
       dist: trusty
       sudo: required
@@ -88,6 +83,7 @@ matrix:
             - gcc-multilib
             - gcc-5
             - gcc-5-multilib
+    
     - 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
@@ -97,6 +93,7 @@ matrix:
             - ubuntu-toolchain-r-test
           packages:
             - gcc-6
+    
     - env: Ubu=14.04 Cmd='make -C tests test-lz4 CC=clang-3.8' COMPILER=clang-3.8
       dist: trusty
       sudo: required

diff --git a/Makefile b/Makefile
index af58719..8f9d544 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -116,6 +116,8 @@ staticAnalyze: clean
        CFLAGS=-g scan-build --status-bugs -v $(MAKE) all
 
 platformTest: clean
+       @echo "\n ---- test lz4 with $(CC) compiler ----"
+       @$(CC) -v
        CFLAGS="-O3 -Werror"         $(MAKE) -C $(LZ4DIR) all
        CFLAGS="-O3 -Werror -static" $(MAKE) -C $(PRGDIR) bins
        CFLAGS="-O3 -Werror -static" $(MAKE) -C $(TESTDIR) bins

diff --git a/tests/Makefile b/tests/Makefile
index c46b04e..3a1ca2a 100644 (file)
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -255,7 +255,9 @@ test-platform:
        $(QEMU_SYS) ./datagen -g16KB  | $(QEMU_SYS) $(PRGDIR)/lz4 -9     | $(QEMU_SYS) $(PRGDIR)/lz4 -t
        $(QEMU_SYS) ./datagen         | $(QEMU_SYS) $(PRGDIR)/lz4        | $(QEMU_SYS) $(PRGDIR)/lz4 -t
        $(QEMU_SYS) ./datagen -g256MB | $(QEMU_SYS) $(PRGDIR)/lz4 -vqB4D | $(QEMU_SYS) $(PRGDIR)/lz4 -qt
+ifneq ($(QEMU_SYS),qemu-arm-static)
        $(QEMU_SYS) ./datagen -g3GB   | $(QEMU_SYS) $(PRGDIR)/lz4 -vqB5D | $(QEMU_SYS) $(PRGDIR)/lz4 -qt
+endif
 
 test-lz4c32: test-lz4c32-basic test-interop-32-64