added zlibwrapper test for Travis

This commit is contained in:
inikep 2016-05-27 11:56:15 +02:00
parent 993a9dfc5a
commit e9dfdf6924
3 changed files with 11 additions and 4 deletions

View File

@ -24,6 +24,7 @@ env:
- ZSTD_TRAVIS_CI_ENV=asan
- ZSTD_TRAVIS_CI_ENV=asan32
- ZSTD_TRAVIS_CI_ENV="-C programs valgrindTest"
- ZSTD_TRAVIS_CI_ENV=zlibwrapper
compiler: gcc

View File

@ -32,6 +32,7 @@
PRGDIR = programs
ZSTDDIR = lib
ZWRAPDIR = zlibWrapper
# Define nul output
ifneq (,$(filter Windows%,$(OS)))
@ -40,7 +41,7 @@ else
VOID = /dev/null
endif
.PHONY: default all zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
.PHONY: default all zlibwrapper zstdprogram clean install uninstall travis-install test clangtest gpptest armtest usan asan uasan
default: zstdprogram
@ -51,12 +52,17 @@ all:
zstdprogram:
$(MAKE) -C $(PRGDIR)
zlibwrapper:
$(MAKE) -C $(ZSTDDIR) all
$(MAKE) -C $(ZWRAPDIR) all
test:
$(MAKE) -C $(PRGDIR) $@
clean:
@$(MAKE) -C $(ZSTDDIR) $@ > $(VOID)
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
@echo Cleaning completed

View File

@ -15,14 +15,14 @@ IMPLIB = -lz ../lib/libzstd.a
endif
ZLIBWRAPPER_PATH = .
EXAMPLE_PATH = examples/
EXAMPLE_PATH = examples
CC = gcc
CFLAGS = $(LOC) -I../lib/common -I$(ZLIBWRAPPER_PATH) -O3 -Wall -std=gnu89
LDFLAGS = $(LOC)
RM = rm -f
all: example example_d
all: clean test testdll
test: example
./example