restored Travis Build Matrix

diff --git a/programs/Makefile b/programs/Makefile
index a81a701..219684f 100644 (file)
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -42,6 +42,18 @@ MANDIR=$(PREFIX)/share/man/man1
 LZ4DIR=..
 
 TEST_FILES = COPYING
+TEST_TARGETS=test-64 test-32
+BENCH_NB=-i5
+
+# Minimize test target for Travis CI's Build Matrix
+ifeq ($(LZ4_TRAVIS_CI_ENV),-m32)
+TEST_TARGETS=test-32
+BENCH_NB=-i1
+else ifeq ($(LZ4_TRAVIS_CI_ENV),-m64)
+TEST_TARGETS=test-64
+BENCH_NB=-i1
+endif
+
 
 # Define *.exe as extension for Windows systems
 ifneq (,$(filter Windows%,$(OS)))
@@ -106,7 +118,11 @@ uninstall:
        [ -f $(DESTDIR)$(MANDIR)/lz4cat.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4cat.1
        @echo lz4 successfully uninstalled
 
-test: test-lz4 test-lz4c test-lz4c32 test-fullbench test-fullbench32 test-fuzzer test-fuzzer32
+test: $(TEST_TARGETS)
+
+test-64: test-lz4 test-lz4c test-fullbench test-fuzzer
+
+test-32: test-lz4 test-lz4c32 test-fullbench32 test-fuzzer32
 
 test-lz4:
 
@@ -115,10 +131,10 @@ test-lz4c:
 test-lz4c32:
 
 test-fullbench: fullbench
-       ./fullbench --no-prompt -i1 $(TEST_FILES)
+       ./fullbench --no-prompt $(BENCH_NB) $(TEST_FILES)
 
 test-fullbench32: fullbench32
-       ./fullbench32 --no-prompt -i1 $(TEST_FILES)
+       ./fullbench32 --no-prompt $(BENCH_NB) $(TEST_FILES)
 
 test-fuzzer: fuzzer
        ./fuzzer --no-prompt