summaryrefslogtreecommitdiffhomepage
path: root/Makefile
diff options
context:
space:
mode:
authorAdin Scannell <ascannell@google.com>2020-07-30 10:05:53 -0700
committergVisor bot <gvisor-bot@google.com>2020-07-30 10:12:20 -0700
commit6a59e765c32f151a549de967f6b010613a5b9aa0 (patch)
tree6b53ee651afbe7ddad65b6927a7d6d59bab3062c /Makefile
parentcb1a3ba63a4a44cf929bb7a1449e76e7664923ff (diff)
Override the test timeout for runtimes.
PiperOrigin-RevId: 324026021
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 8e97fc978..d8135a082 100644
--- a/Makefile
+++ b/Makefile
@@ -155,7 +155,7 @@ syscall-tests: syscall-ptrace-tests syscall-kvm-tests syscall-native-tests
%-runtime-tests: load-runtimes_%
@$(call submake,install-test-runtime)
- @$(call submake,test-runtime TARGETS="//test/runtimes:$*")
+ @$(call submake,test-runtime OPTIONS="--test_timeout=10800" TARGETS="//test/runtimes:$*")
do-tests: runsc
@$(call submake,run TARGETS="//runsc" ARGS="--rootless do true")
@@ -370,5 +370,5 @@ configure: ## Configures a single runtime. Requires sudo. Typically called from
.PHONY: configure
test-runtime: ## A convenient wrapper around test that provides the runtime argument. Target must still be provided.
- @$(call submake,test OPTIONS="$(OPTIONS) --test_output=streamed --test_arg=--runtime=$(RUNTIME)")
+ @$(call submake,test OPTIONS="$(OPTIONS) --test_arg=--runtime=$(RUNTIME)")
.PHONY: test-runtime