summaryrefslogtreecommitdiffstats
path: root/programs
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-11-04 19:56:38 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-11-04 19:56:38 (GMT)
commit73554386ed8c9b08940411c0e62bbdca3216f8cd (patch)
tree618e58f16d0398e4dbd50e97c12e2a5b6304e2c6 /programs
parent4befab0fcc741101c4cfd4b81a6ca60ba5a4dafe (diff)
downloadlz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.zip
lz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.tar.gz
lz4-73554386ed8c9b08940411c0e62bbdca3216f8cd.tar.bz2
Makefile : refactored Travis CI tests
Diffstat (limited to 'programs')
-rw-r--r--programs/Makefile27
1 files changed, 4 insertions, 23 deletions
diff --git a/programs/Makefile b/programs/Makefile
index ba08cfb..1d7e17f 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -58,29 +58,7 @@ endif
# Select test target for Travis CI's Build Matrix
-ifeq ($(LZ4_TRAVIS_CI_ENV),-lz4)
-TRAVIS_TARGET=test-lz4
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-lz4c)
-TRAVIS_TARGET=test-lz4c
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-lz4c32)
-TRAVIS_TARGET=test-lz4c32
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-fullbench)
-TRAVIS_TARGET=test-fullbench
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-fullbench32)
-TRAVIS_TARGET=test-fullbench32
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-fuzzer)
-TRAVIS_TARGET=test-fuzzer
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-fuzzer32)
-TRAVIS_TARGET=test-fuzzer32
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-frametest)
-TRAVIS_TARGET=test-frametest
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-frametest32)
-TRAVIS_TARGET=test-frametest32
-else ifeq ($(LZ4_TRAVIS_CI_ENV),-mem)
-TRAVIS_TARGET=test-mem
-else
-TRAVIS_TARGET=test
-endif
+TRAVIS_TARGET=$(LZ4_TRAVIS_CI_ENV)
default: lz4 lz4c
@@ -166,6 +144,7 @@ test-lz4: lz4 datagen
./datagen | ./lz4 | ./lz4 -vdq > $(VOID)
./datagen -g256MB | ./lz4 -vqB4D | ./lz4 -vdq > $(VOID)
./datagen -g6GB | ./lz4 -vqB5D | ./lz4 -vdq > $(VOID)
+# test frame concatenation with null-length frame
echo -n > empty.test
echo hi > nonempty.test
cat nonempty.test empty.test nonempty.test > orig.test
@@ -175,6 +154,8 @@ test-lz4: lz4 datagen
./lz4 -d concat.lz4.test > result.test
sdiff orig.test result.test
@rm *.test
+ @echo frame concatenation test completed
+# test frame concatenation with null-length frame
test-lz4c: lz4c datagen