Permalink
Browse files

fix Travis long test list;

added zbufftest-dll
  • Loading branch information...
1 parent d46ecb5 commit 31ff2a23be05bd01f8dfebb2015eaec34b9aa1a3 @Cyan4973 Cyan4973 committed Dec 17, 2016
Showing with 13 additions and 6 deletions.
  1. +3 −3 .travis.yml
  2. +10 −3 tests/Makefile
View
@@ -112,9 +112,9 @@ matrix:
packages:
- valgrind
- - env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean \
- && make c99test && make clean && make gnu99test && make clean \
- && make clangtest && make clean && make -C contrib/pzstd googletest32 \
+ - env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean
+ && make c99test && make clean && make gnu99test && make clean
+ && make clangtest && make clean && make -C contrib/pzstd googletest32
&& make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
os: linux
dist: trusty
View
@@ -57,15 +57,15 @@ ZSTREAM_TESTTIME = -T2mn
FUZZERTEST= -T5mn
ZSTDRTTEST= --test-large-data
-.PHONY: default all all32 clean test test32 test-all namespaceTest versionsTest
+.PHONY: default all all32 dll clean test test32 test-all namespaceTest versionsTest
default: fullbench
all: fullbench fuzzer zstreamtest paramgrill datagen zbufftest
all32: fullbench32 fuzzer32 zstreamtest32 zbufftest32
-dll: fuzzer-dll zstreamtest-dll
+dll: fuzzer-dll zstreamtest-dll zbufftest-dll
@@ -116,6 +116,13 @@ zbufftest32 : CFLAGS += -Wno-deprecated-declarations -m32
zbufftest32 : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c zbufftest.c
$(CC) $(FLAGS) $^ -o $@$(EXT)
+zbufftest-dll : CPPFLAGS += -I$(ZSTDDIR)/deprecated
+zbufftest-dll : CFLAGS += -Wno-deprecated-declarations # required to silence deprecation warnings
+zbufftest-dll : LDFLAGS+= -L$(ZSTDDIR) -lzstd
+zbufftest-dll : $(ZSTDDIR)/common/xxhash.c $(PRGDIR)/datagen.c zbufftest.c
+ $(MAKE) -C $(ZSTDDIR) libzstd
+ $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@$(EXT)
+
zstreamtest : $(ZSTD_FILES) $(PRGDIR)/datagen.c zstreamtest.c
$(CC) $(FLAGS) $^ -o $@$(EXT)
@@ -163,7 +170,7 @@ clean:
fullbench$(EXT) fullbench32$(EXT) \
fullbench-lib$(EXT) fullbench-dll$(EXT) \
fuzzer$(EXT) fuzzer32$(EXT) zbufftest$(EXT) zbufftest32$(EXT) \
- fuzzer-dll$(EXT) zstreamtest-dll$(EXT) \
+ fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT)\
zstreamtest$(EXT) zstreamtest32$(EXT) \
datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \
symbols$(EXT)

0 comments on commit 31ff2a2

Please sign in to comment.