diff options
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | programs/Makefile | 5 | ||||
| -rw-r--r-- | tests/Makefile | 1 | ||||
| -rw-r--r-- | tests/test-lz4-versions.py | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index e5db749..58eee4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: # 14.04 LTS Server Edition 64 bit - - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 clean versionsTest' COMPILER=cc + - env: Ubu=14.04 Cmd='make -C tests test-lz4c32 test-fullbench32 versionsTest' COMPILER=cc dist: trusty sudo: required addons: diff --git a/programs/Makefile b/programs/Makefile index 2f1c3cc..9939a44 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -68,13 +68,14 @@ lz4-release: lz4 lz4c : $(LZ4DIR)/lz4.o $(LZ4DIR)/lz4hc.o $(LZ4DIR)/lz4frame.o $(LZ4DIR)/xxhash.o bench.o lz4io.o lz4cli.c datagen.o $(CC) $(FLAGS) -DENABLE_LZ4C_LEGACY_OPTIONS $^ -o $@$(EXT) -lz4c32: CFLAGS += -m32 +lz4c32: CFLAGS+=-m32 lz4c32: lz4 + @cp lz4$(EXT) lz4c32$(EXT) clean: @$(MAKE) -C $(LZ4DIR) $@ > $(VOID) @$(RM) core *.o *.test tmp* \ - lz4$(EXT) lz4c$(EXT) + lz4$(EXT) lz4c$(EXT) lz4c32$(EXT) @echo Cleaning completed diff --git a/tests/Makefile b/tests/Makefile index c1ec43d..288b665 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -114,6 +114,7 @@ clean: @rm -fR $(TESTDIR) @echo Cleaning completed +.PHONY: versionsTest versionsTest: $(PYTHON) test-lz4-versions.py diff --git a/tests/test-lz4-versions.py b/tests/test-lz4-versions.py index 12c1c66..d7fd199 100644 --- a/tests/test-lz4-versions.py +++ b/tests/test-lz4-versions.py @@ -84,11 +84,11 @@ if __name__ == '__main__': os.chdir(clone_dir) git(['--work-tree=' + r_dir, 'checkout', tag, '--', '.'], False) os.chdir(r_dir + '/programs') # /path/to/lz4/lz4test/<TAG>/programs - make(['clean', 'lz4c', 'lz4c32'], False) else: os.chdir(programs_dir) - make(['lz4c', 'lz4c32'], False) + make(['clean', 'lz4c'], False) shutil.copy2('lz4c', dst_lz4c) + make(['clean', 'lz4c32'], False) shutil.copy2('lz4c32', dst_lz4c32) # Compress test.dat by all released lz4c and lz4c32 |