diff options
author | Yann Collet <cyan@fb.com> | 2019-04-23 00:45:40 (GMT) |
---|---|---|
committer | Yann Collet <cyan@fb.com> | 2019-04-23 00:45:40 (GMT) |
commit | 229b016f507cdc0db300c22ac4ec8bab7cd0874f (patch) | |
tree | 34144af1208f92e528a9ec7a9df0d67812d69765 /tests | |
parent | 1e700b6f85bbc9e7052190f2f686041367321766 (diff) | |
parent | 291b3d8b7e61efc260639c731a3b429419cbc471 (diff) | |
download | lz4-229b016f507cdc0db300c22ac4ec8bab7cd0874f.zip lz4-229b016f507cdc0db300c22ac4ec8bab7cd0874f.tar.gz lz4-229b016f507cdc0db300c22ac4ec8bab7cd0874f.tar.bz2 |
Merge branch 'dev' of github.com:Cyan4973/lz4 into dev
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tests/Makefile b/tests/Makefile index ddc6d1e..02c2ab6 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -43,15 +43,8 @@ CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) CPPFLAGS+= -I$(LZ4DIR) -I$(PRGDIR) -DXXH_NAMESPACE=LZ4_ FLAGS = $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) +include ../Makefile.inc -# Define *.exe as extension for Windows systems -ifneq (,$(filter Windows%,$(OS))) -EXT =.exe -VOID = nul -else -EXT = -VOID = /dev/null -endif LZ4 := $(PRGDIR)/lz4$(EXT) @@ -60,7 +53,6 @@ TEST_FILES := COPYING FUZZER_TIME := -T90s NB_LOOPS ?= -i1 - default: all all: fullbench fuzzer frametest roundTripTest datagen checkFrame @@ -95,7 +87,7 @@ fullbench-lib: fullbench.c $(LZ4DIR)/liblz4.a fullbench-dll: fullbench.c $(LZ4DIR)/xxhash.c $(MAKE) -C $(LZ4DIR) liblz4 - $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/liblz4.dll + $(CC) $(FLAGS) $^ -o $@$(EXT) -DLZ4_DLL_IMPORT=1 $(LZ4DIR)/dll/$(LIBLZ4).dll fuzzer : lz4.o lz4hc.o xxhash.o fuzzer.c $(CC) $(FLAGS) $^ -o $@$(EXT) @@ -137,7 +129,7 @@ checkTag: checkTag.c $(LZ4DIR)/lz4.h #----------------------------------------------------------------------------- # validated only for Linux, OSX, BSD, Hurd and Solaris targets #----------------------------------------------------------------------------- -ifneq (,$(filter $(shell uname),Linux Darwin GNU/kFreeBSD GNU OpenBSD FreeBSD NetBSD DragonFly SunOS Haiku MidnightBSD)) +ifeq ($(POSIX_ENV),Yes) MD5:=md5sum ifneq (,$(filter $(shell uname), Darwin )) @@ -305,6 +297,7 @@ test-lz4-basic: lz4 datagen unlz4 lz4cat test ! -f ./-z $(DIFF) -q tmp-tlb-hw tmp-tlb4 $(LZ4) -f tmp-tlb-hw + $(LZ4) --list tmp-tlb-hw.lz4 # test --list on valid single-frame file cat tmp-tlb-hw >> tmp-tlb-hw.lz4 $(LZ4) -f tmp-tlb-hw.lz4 # uncompress valid frame followed by invalid data $(LZ4) -BX tmp-tlb-hw -c -q | $(LZ4) -tv # test block checksum |