added zlibwrapper test for Travis
This commit is contained in:
parent
993a9dfc5a
commit
e9dfdf6924
@ -24,6 +24,7 @@ env:
|
|||||||
- ZSTD_TRAVIS_CI_ENV=asan
|
- ZSTD_TRAVIS_CI_ENV=asan
|
||||||
- ZSTD_TRAVIS_CI_ENV=asan32
|
- ZSTD_TRAVIS_CI_ENV=asan32
|
||||||
- ZSTD_TRAVIS_CI_ENV="-C programs valgrindTest"
|
- ZSTD_TRAVIS_CI_ENV="-C programs valgrindTest"
|
||||||
|
- ZSTD_TRAVIS_CI_ENV=zlibwrapper
|
||||||
|
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
|
||||||
|
8
Makefile
8
Makefile
@ -32,6 +32,7 @@
|
|||||||
|
|
||||||
PRGDIR = programs
|
PRGDIR = programs
|
||||||
ZSTDDIR = lib
|
ZSTDDIR = lib
|
||||||
|
ZWRAPDIR = zlibWrapper
|
||||||
|
|
||||||
# Define nul output
|
# Define nul output
|
||||||
ifneq (,$(filter Windows%,$(OS)))
|
ifneq (,$(filter Windows%,$(OS)))
|
||||||
@ -40,7 +41,7 @@ else
|
|||||||
VOID = /dev/null
|
VOID = /dev/null
|
||||||
endif
|
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
|
default: zstdprogram
|
||||||
|
|
||||||
@ -51,12 +52,17 @@ all:
|
|||||||
zstdprogram:
|
zstdprogram:
|
||||||
$(MAKE) -C $(PRGDIR)
|
$(MAKE) -C $(PRGDIR)
|
||||||
|
|
||||||
|
zlibwrapper:
|
||||||
|
$(MAKE) -C $(ZSTDDIR) all
|
||||||
|
$(MAKE) -C $(ZWRAPDIR) all
|
||||||
|
|
||||||
test:
|
test:
|
||||||
$(MAKE) -C $(PRGDIR) $@
|
$(MAKE) -C $(PRGDIR) $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@$(MAKE) -C $(ZSTDDIR) $@ > $(VOID)
|
@$(MAKE) -C $(ZSTDDIR) $@ > $(VOID)
|
||||||
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
|
@$(MAKE) -C $(PRGDIR) $@ > $(VOID)
|
||||||
|
@$(MAKE) -C $(ZWRAPDIR) $@ > $(VOID)
|
||||||
@echo Cleaning completed
|
@echo Cleaning completed
|
||||||
|
|
||||||
|
|
||||||
|
@ -15,14 +15,14 @@ IMPLIB = -lz ../lib/libzstd.a
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
ZLIBWRAPPER_PATH = .
|
ZLIBWRAPPER_PATH = .
|
||||||
EXAMPLE_PATH = examples/
|
EXAMPLE_PATH = examples
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CFLAGS = $(LOC) -I../lib/common -I$(ZLIBWRAPPER_PATH) -O3 -Wall -std=gnu89
|
CFLAGS = $(LOC) -I../lib/common -I$(ZLIBWRAPPER_PATH) -O3 -Wall -std=gnu89
|
||||||
LDFLAGS = $(LOC)
|
LDFLAGS = $(LOC)
|
||||||
RM = rm -f
|
RM = rm -f
|
||||||
|
|
||||||
|
|
||||||
all: example example_d
|
all: clean test testdll
|
||||||
|
|
||||||
test: example
|
test: example
|
||||||
./example
|
./example
|
||||||
|
Loading…
Reference in New Issue
Block a user