Increase test timeouts
Increased for strace to 30 min. Increased other places by 100% to
help prevent random timeouts on overloaded machines.
Change-Id: I9dd4def34513062723ae6744eabc2bacc68b4e0f
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index aa45d40..4e99702 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -42,9 +42,9 @@
TIME_OUT="gdb" # "n" (disabled), "timeout" (use timeout), "gdb" (use gdb)
# Value in seconds
if [ "$ART_USE_READ_BARRIER" = "true" ]; then
- TIME_OUT_VALUE=900 # 15 minutes.
+ TIME_OUT_VALUE=1800 # 30 minutes.
else
- TIME_OUT_VALUE=600 # 10 minutes.
+ TIME_OUT_VALUE=1200 # 20 minutes.
fi
USE_GDB="n"
USE_JVM="n"
@@ -199,6 +199,10 @@
shift
INSTRUCTION_SET_FEATURES="$1"
shift
+ elif [ "x$1" = "x--timeout" ]; then
+ shift
+ TIME_OUT_VALUE="$1"
+ shift
elif [ "x$1" = "x--" ]; then
shift
break
diff --git a/test/run-test b/test/run-test
index 2710ea3..d4a02f3 100755
--- a/test/run-test
+++ b/test/run-test
@@ -241,7 +241,7 @@
shift
elif [ "x$1" = "x--strace" ]; then
strace="yes"
- run_args="${run_args} --invoke-with strace --invoke-with -o --invoke-with $tmp_dir/$strace_output"
+ run_args="${run_args} --timeout 1800 --invoke-with strace --invoke-with -o --invoke-with $tmp_dir/$strace_output"
shift
elif [ "x$1" = "x--zygote" ]; then
run_args="${run_args} --zygote"