summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyan4973 <yann.collet.73@gmail.com>2014-05-01 16:03:08 (GMT)
committerCyan4973 <yann.collet.73@gmail.com>2014-05-01 16:03:08 (GMT)
commitd7ebeb7861cbf0d29f3b9d099ec1fd8a72d71d79 (patch)
tree48eaa6800cccafad8788c1bf928404ffbbc0bcc7
parent42cb61367a20fdec4f8092cf3c9b38c53cfa7a46 (diff)
parent729019997983961175348722f71230cba990e436 (diff)
downloadlz4-d7ebeb7861cbf0d29f3b9d099ec1fd8a72d71d79.zip
lz4-d7ebeb7861cbf0d29f3b9d099ec1fd8a72d71d79.tar.gz
lz4-d7ebeb7861cbf0d29f3b9d099ec1fd8a72d71d79.tar.bz2
Merge pull request #4 from t-mat/travis-ci-build-matrix
Add Travis CI Build Matrix to decrease testing time
-rw-r--r--.travis.yml7
-rw-r--r--README.md2
-rw-r--r--programs/Makefile15
3 files changed, 23 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 695c19f..2880427 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,3 +4,10 @@ script: make test
before_install:
- sudo apt-get update -qq
- sudo apt-get install -qq gcc-multilib
+
+env:
+ - LZ4_TRAVIS_CI_ENV=-m32
+ - LZ4_TRAVIS_CI_ENV=-m64
+
+matrix:
+ fast_finish: true
diff --git a/README.md b/README.md
index 98ba7c6..7dc0cd2 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
LZ4 - Extremely fast compression
================================
+[![Build Status](https://travis-ci.org/Cyan4973/lz4.svg?branch=dev)](https://travis-ci.org/Cyan4973/lz4)
+
LZ4 is lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems.
A high compression derivative, called LZ4_HC, is also provided. It trades CPU time for compression ratio.
diff --git a/programs/Makefile b/programs/Makefile
index 6dba83c..c0d6d15 100644
--- a/programs/Makefile
+++ b/programs/Makefile
@@ -42,6 +42,15 @@ MANDIR=$(PREFIX)/share/man/man1
LZ4DIR=..
TEST_FILES = COPYING
+TEST_TARGETS=test-32 test-64
+
+# Minimize test target for Travis CI's Build Matrix
+ifeq ($(LZ4_TRAVIS_CI_ENV),-m32)
+TEST_TARGETS=test-32
+else ifeq ($(LZ4_TRAVIS_CI_ENV),-m64)
+TEST_TARGETS=test-64
+endif
+
# Define *.exe as extension for Windows systems
ifneq (,$(filter Windows%,$(OS)))
@@ -106,7 +115,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-32: test-lz4 test-lz4c32 test-fullbench32 test-fuzzer32
+
+test-64: test-lz4 test-lz4c test-fullbench test-fuzzer
test-lz4: