diff options
| author | Takayuki MATSUOKA <takayuki.matsuoka@gmail.com> | 2014-04-30 15:29:13 (GMT) |
|---|---|---|
| committer | Takayuki MATSUOKA <takayuki.matsuoka@gmail.com> | 2014-04-30 15:29:13 (GMT) |
| commit | dca4bc35957f97e12170c0e04f1b621e3c41ec7f (patch) | |
| tree | 375841fe485cab766eff59e97b664b101a7d0a64 | |
| parent | 42cb61367a20fdec4f8092cf3c9b38c53cfa7a46 (diff) | |
| download | lz4-dca4bc35957f97e12170c0e04f1b621e3c41ec7f.zip lz4-dca4bc35957f97e12170c0e04f1b621e3c41ec7f.tar.gz lz4-dca4bc35957f97e12170c0e04f1b621e3c41ec7f.tar.bz2 | |
Add Travis CI's Build Matrix
See also : http://docs.travis-ci.com/user/build-configuration/#The-Build-Matrix
| -rw-r--r-- | .travis.yml | 7 | ||||
| -rw-r--r-- | programs/Makefile | 15 |
2 files changed, 21 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/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: |