diff options
| author | 2015-01-16 02:10:06 +0000 | |
|---|---|---|
| committer | 2015-01-16 02:10:07 +0000 | |
| commit | 3e384652fe16127ce4c9c25d4fa44ce1c5a9dc9f (patch) | |
| tree | dcfc7b8dddad2fb58a170efa71d8c291350ee497 | |
| parent | 3ea0b9fbb6aa8c451a12ccfb7befd5a871be877e (diff) | |
| parent | 8dcde2323413d8b3e4926154e143da331f582c70 (diff) | |
Merge "Increase default timeout"
| -rw-r--r-- | test/114-ParallelGC/src/Main.java | 2 | ||||
| -rwxr-xr-x | test/etc/run-test-jar | 2 |
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" |