From 20ee648540756617edcf1bc9e5e364749dc49ad7 Mon Sep 17 00:00:00 2001 From: Kenfe-Mickael Laventure Date: Mon, 28 Mar 2016 11:21:50 -0700 Subject: [PATCH] Add per test and suite timeout values to Makefile Signed-off-by: Kenfe-Mickael Laventure --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2248e87..4dc6b9f 100644 --- a/Makefile +++ b/Makefile @@ -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} +TEST_TIMEOUT ?= 5m +TEST_SUITE_TIMEOUT ?= 10m + # 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 # so that the user can send e.g. ^C through. @@ -84,7 +87,7 @@ test: all validate ifneq ($(wildcard /.dockerenv), ) $(MAKE) install bundles-rootfs 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 validate: fmt