commit 2a455e162cbba5dad610b02155957aa7759c9a34
author Hiroshi Yamauchi <yamauchi@google.com> Thu Sep 10 23:32:47 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Sep 10 23:32:47 2015 +0000
tree 6f7db60f47cef063bd8cd81c19e6fb391c68c5e4
parent 010c7fd437932e0132fc4b44de6274480573ff30
parent dcf0d4baacf04be16d76f6ac2c15fa3e9c95be21

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

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