Increase gcstress timeout
Recent unwinding fixes mean gcstress has more work to do.
Bug: 142039427
Test: ./art/test.py -b -r --gcstress --host -t 001
Change-Id: Ice02b4f0be9cfb9c0189bdfc4e10356fb4bd1ffd
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 73240b9..830f36d 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -142,8 +142,8 @@
LIB="$1"
shift
elif [ "x$1" = "x--gc-stress" ]; then
- # Give an extra 10 mins if we are gc-stress.
- TIME_OUT_EXTRA=$((${TIME_OUT_EXTRA} + 600))
+ # Give an extra 20 mins if we are gc-stress.
+ TIME_OUT_EXTRA=$((${TIME_OUT_EXTRA} + 1200))
shift
elif [ "x$1" = "x--testlib" ]; then
shift
diff --git a/test/testrunner/testrunner.py b/test/testrunner/testrunner.py
index 5e4418a..ae45c4c 100755
--- a/test/testrunner/testrunner.py
+++ b/test/testrunner/testrunner.py
@@ -87,10 +87,10 @@
# does not push the value to run-test. run-test is somewhat complicated:
# base: 25m (large for ASAN)
# + timeout handling: 2m
-# + gcstress extra: 5m
+# + gcstress extra: 20m
# -----------------------
-# 32m
-timeout = 2100 # 35 minutes
+# 47m
+timeout = 3600 # 60 minutes
# DISABLED_TEST_CONTAINER holds information about the disabled tests. It is a map
# that has key as the test name (like 001-HelloWorld), and value as set of