summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-01-15 17:23:16 -0800
committer Mathieu Chartier <mathieuc@google.com> 2015-01-15 18:03:07 -0800
commit8dcde2323413d8b3e4926154e143da331f582c70 (patch)
treedcfc7b8dddad2fb58a170efa71d8c291350ee497
parent3ea0b9fbb6aa8c451a12ccfb7befd5a871be877e (diff)
Increase default timeout
Bug: 19027813 Change-Id: I13af576dc3e980dc82e466435f41b322e2cd873e
-rw-r--r--test/114-ParallelGC/src/Main.java2
-rwxr-xr-xtest/etc/run-test-jar2
2 files changed, 2 insertions, 2 deletions
diff --git a/test/114-ParallelGC/src/Main.java b/test/114-ParallelGC/src/Main.java
index 963fdac45d..48f9bd363f 100644
--- a/test/114-ParallelGC/src/Main.java
+++ b/test/114-ParallelGC/src/Main.java
@@ -26,7 +26,7 @@ public class Main implements Runnable {
// Timeout in minutes. Make it larger than the run-test timeout to get a native thread dump by
// ART on timeout when running on the host.
- public final static long TIMEOUT_VALUE = 7;
+ public final static long TIMEOUT_VALUE = 12;
public final static long MAX_SIZE = 1000; // Maximum size of array-list to allocate.
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 2710df8dc4..d05b57ccb8 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -38,7 +38,7 @@ RELOCATE="y"
SECONDARY_DEX=""
TIME_OUT="y"
# Value in minutes.
-TIME_OUT_VALUE=5
+TIME_OUT_VALUE=10
USE_GDB="n"
USE_JVM="n"
VERIFY="y"