diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | programs/Makefile | 9 |
3 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index fea2b3d..472ca18 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: c compiler: gcc -script: make test-travis +script: make test before_install: - sudo apt-get update -qq - sudo apt-get install -qq gcc-multilib @@ -107,6 +107,7 @@ liblz4: lz4.c lz4hc.c clean: @rm -f core *.o *.a *.$(SHARED_EXT) *.$(SHARED_EXT).* $(DISTRIBNAME) *.sha1 liblz4.pc @cd $(PRGDIR); $(MAKE) clean + @cd examples; $(MAKE) clean @echo Cleaning completed @@ -162,9 +163,7 @@ dist: clean @echo Distribution $(DISTRIBNAME) built test: - @cd $(PRGDIR); $(MAKE) -e $@ - -test-travis: lz4programs + @cd examples; $(MAKE) -e $@ @cd $(PRGDIR); $(MAKE) -e $@ endif diff --git a/programs/Makefile b/programs/Makefile index d8d38f7..a04c323 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -44,7 +44,7 @@ MANDIR=$(PREFIX)/share/man/man1 LZ4DIR=.. TEST_FILES = COPYING -TEST_TARGETS=test +TEST_TARGETS=test-native BENCH_NB=-i5 # Minimize test target for Travis CI's Build Matrix @@ -52,7 +52,6 @@ ifeq ($(LZ4_TRAVIS_CI_ENV),-m32) TEST_TARGETS=test-force32 BENCH_NB=-i1 else ifeq ($(LZ4_TRAVIS_CI_ENV),-m64) -TEST_TARGETS=test BENCH_NB=-i1 endif @@ -129,13 +128,13 @@ uninstall: [ -f $(DESTDIR)$(MANDIR)/lz4cat.1 ] && rm -f $(DESTDIR)$(MANDIR)/lz4cat.1 @echo lz4 successfully uninstalled -test: test-lz4 test-lz4c test-fullbench test-fuzzer test-mem +test-native: test-lz4 test-lz4c test-fullbench test-fuzzer test-mem test-force32: test-lz4c32 test-fullbench32 test-fuzzer32 test-mem32 -test-all: test test-force32 +test-all: test-native test-force32 -test-travis: $(TEST_TARGETS) +test: $(TEST_TARGETS) test-lz4: lz4 datagen ./datagen -g16KB | ./lz4 -9 | ./lz4 -vdq > $(VOID) |