added zlibwrapper test for Travis

diff --git a/.travis.yml b/.travis.yml
index f583a803d835d6e85606a20d49d2a691017bf401..70f4becee9d9875adc1f08365153d74b065ce986 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,7 +24,8 @@ 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
 
 script: 

diff --git a/Makefile b/Makefile
index 0894f75d7ada6cdd369b684df8d091ad9be6d226..6be618bc107cd6d903d54bc6049fa4bd5b6ec9fb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -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
 
 

diff --git a/zlibWrapper/Makefile b/zlibWrapper/Makefile
index fd45ee6d3d20d8583d44b64d7abb78c2d98f03e4..c74107d40b1dceb18dba4b855070cb206538176c 100644 (file)
--- a/zlibWrapper/Makefile
+++ b/zlibWrapper/Makefile
@@ -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