This commit is contained in:
Mitchell Hashimoto 2014-07-10 11:43:32 -07:00
parent 9d3adc07ca
commit 701634ad5c
1 changed files with 1 additions and 2 deletions

View File

@ -2,7 +2,6 @@ CGO_CFLAGS:=-I$(CURDIR)/vendor/libucl/include
CGO_LDFLAGS:=-L$(CURDIR)/vendor/libucl CGO_LDFLAGS:=-L$(CURDIR)/vendor/libucl
LIBUCL_NAME=libucl.a LIBUCL_NAME=libucl.a
TEST?=./... TEST?=./...
TESTARGS?=-timeout=5s
# Windows-only # Windows-only
ifeq ($(OS), Windows_NT) ifeq ($(OS), Windows_NT)
@ -23,7 +22,7 @@ dev: libucl
libucl: vendor/libucl/$(LIBUCL_NAME) libucl: vendor/libucl/$(LIBUCL_NAME)
test: libucl test: libucl
go test $(TEST) $(TESTARGS) go test $(TEST) $(TESTARGS) -timeout=10s
testacc: libucl testacc: libucl
@if [ "$(TEST)" = "./..." ]; then \ @if [ "$(TEST)" = "./..." ]; then \