Skip to content

Commit 31ff2a2

Browse files
committed
fix Travis long test list;
added zbufftest-dll
1 parent d46ecb5 commit 31ff2a2

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ matrix:
112112
packages:
113113
- valgrind
114114

115-
- env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean \
116-
&& make c99test && make clean && make gnu99test && make clean \
117-
&& make clangtest && make clean && make -C contrib/pzstd googletest32 \
115+
- env: Ubu=14.04 Cmd="make gpptest && make clean && make gnu90test && make clean
116+
&& make c99test && make clean && make gnu99test && make clean
117+
&& make clangtest && make clean && make -C contrib/pzstd googletest32
118118
&& make -C contrib/pzstd all32 && make -C contrib/pzstd check && make -C contrib/pzstd clean"
119119
os: linux
120120
dist: trusty

tests/Makefile

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,15 +57,15 @@ ZSTREAM_TESTTIME = -T2mn
5757
FUZZERTEST= -T5mn
5858
ZSTDRTTEST= --test-large-data
5959

60-
.PHONY: default all all32 clean test test32 test-all namespaceTest versionsTest
60+
.PHONY: default all all32 dll clean test test32 test-all namespaceTest versionsTest
6161

6262
default: fullbench
6363

6464
all: fullbench fuzzer zstreamtest paramgrill datagen zbufftest
6565

6666
all32: fullbench32 fuzzer32 zstreamtest32 zbufftest32
6767

68-
dll: fuzzer-dll zstreamtest-dll
68+
dll: fuzzer-dll zstreamtest-dll zbufftest-dll
6969

7070

7171

@@ -116,6 +116,13 @@ zbufftest32 : CFLAGS += -Wno-deprecated-declarations -m32
116116
zbufftest32 : $(ZSTD_FILES) $(ZBUFF_FILES) $(PRGDIR)/datagen.c zbufftest.c
117117
$(CC) $(FLAGS) $^ -o $@$(EXT)
118118

119+
zbufftest-dll : CPPFLAGS += -I$(ZSTDDIR)/deprecated
120+
zbufftest-dll : CFLAGS += -Wno-deprecated-declarations # required to silence deprecation warnings
121+
zbufftest-dll : LDFLAGS+= -L$(ZSTDDIR) -lzstd
122+
zbufftest-dll : $(ZSTDDIR)/common/xxhash.c $(PRGDIR)/datagen.c zbufftest.c
123+
$(MAKE) -C $(ZSTDDIR) libzstd
124+
$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) -o $@$(EXT)
125+
119126
zstreamtest : $(ZSTD_FILES) $(PRGDIR)/datagen.c zstreamtest.c
120127
$(CC) $(FLAGS) $^ -o $@$(EXT)
121128

@@ -163,7 +170,7 @@ clean:
163170
fullbench$(EXT) fullbench32$(EXT) \
164171
fullbench-lib$(EXT) fullbench-dll$(EXT) \
165172
fuzzer$(EXT) fuzzer32$(EXT) zbufftest$(EXT) zbufftest32$(EXT) \
166-
fuzzer-dll$(EXT) zstreamtest-dll$(EXT) \
173+
fuzzer-dll$(EXT) zstreamtest-dll$(EXT) zbufftest-dll$(EXT)\
167174
zstreamtest$(EXT) zstreamtest32$(EXT) \
168175
datagen$(EXT) paramgrill$(EXT) roundTripCrash$(EXT) longmatch$(EXT) \
169176
symbols$(EXT)

0 commit comments

Comments
 (0)