commit dcf0d4baacf04be16d76f6ac2c15fa3e9c95be21
author Hiroshi Yamauchi <yamauchi@google.com> Wed Sep 09 18:59:42 2015 -0700
committer Hiroshi Yamauchi <yamauchi@google.com> Thu Sep 10 10:50:01 2015 -0700
tree f3c9ce3003fd52b90f25a4d891b52c4b45f002b4
parent dbd357086fdb7fce619d745fda4efd52377becdd

Increase the run-test timeout for the read barrier config.

ThreadStress sometimes times out without hanging.

Bug: 23485091
Change-Id: Id6833c7887ece74aebafc6e1d5a8c772d7e0ae62

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index ad3fb41..efc0bfb 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -39,7 +39,11 @@
 SECONDARY_DEX=""
 TIME_OUT="gdb"  # "n" (disabled), "timeout" (use timeout), "gdb" (use gdb)
 # Value in seconds
-TIME_OUT_VALUE=600  # 10 minutes.
+if [ "$ART_USE_READ_BARRIER" = "true" ]; then
+  TIME_OUT_VALUE=900  # 15 minutes.
+else
+  TIME_OUT_VALUE=600  # 10 minutes.
+fi
 USE_GDB="n"
 USE_JVM="n"
 VERIFY="y" # y=yes,n=no,s=softfail