diff --git a/.travis.yml b/.travis.yml index f8e79ac..57f7a67 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ language: objective-c os: osx before_install: brew update -install: brew install check && brew install make +install: brew install check -script: make && gmake test +script: make && make test diff --git a/tests/Makefile b/tests/Makefile index 73f348b..03eed98 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -8,12 +8,6 @@ CHECK_PATH = /usr/local LDFLAGS = -L$(CHECK_PATH)/lib `pkg-config check --libs` -lpthread `sh ../src/osflags $(TARGETOS) link` CFLAGS = -std=c99 -g -Wall -D$(OS) `pkg-config check --cflags` -I../src -I$(CHECK_PATH)/include -pedantic `sh ../src/osflags $(TARGETOS) cflags` -# Hide clang warnings from check.h about "token pasting of ',' and __VA_ARGS__ is a GNU extension" -# and "'format' attribute argument not supported: gnu_printf" -ifeq (clang,$(findstring clang,$(CC))) -CFLAGS += -Wno-gnu-zero-variadic-macro-arguments -Wno-ignored-attributes -endif - all: $(TEST) @LD_LIBRARY_PATH=${CHECK_PATH}/lib ./$(TEST)