vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Add per test and suite timeout values to Makefile

Browse source 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
Kenfe-Mickael Laventure 2016-03-28 11:21:50 -07:00
parent bf20f56615
commit 20ee648540
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -7,6 +7,9 @@ GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null)
LDFLAGS := -X github.com/docker/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS} LDFLAGS := -X github.com/docker/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS}
TEST_TIMEOUT ?= 5m
TEST_SUITE_TIMEOUT ?= 10m
# if this session isn't interactive, then we don't want to allocate a # if this session isn't interactive, then we don't want to allocate a
# TTY, which would fail, but if it is interactive, we do want to attach # TTY, which would fail, but if it is interactive, we do want to attach
# so that the user can send e.g. ^C through. # so that the user can send e.g. ^C through.
@ -84,7 +87,7 @@ test: all validate
ifneq ($(wildcard /.dockerenv), ) ifneq ($(wildcard /.dockerenv), )
$(MAKE) install bundles-rootfs $(MAKE) install bundles-rootfs
cd integration-test ; \ cd integration-test ; \
go test -check.v $(TESTFLAGS) github.com/docker/containerd/integration-test go test -check.v -check.timeout=$(TEST_TIMEOUT) timeout=$(TEST_SUITE_TIMEOUT) $(TESTFLAGS) github.com/docker/containerd/integration-test
endif endif
validate: fmt validate: fmt