| commit | 2d929f9a77abf600ad593ae46839c56c3f87963c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 20 23:14:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu May 20 23:14:48 2021 +0000 |
| tree | d03161a60f9809c4aa971768ac0f24c51ce2ed0f | |
| parent | a7d5a621ea0a81b9ab4c7984174134ca713ee496 [diff] | |
| parent | 4644759d4cb1c132d3e516bd454aae65f40a958d [diff] |
Merge "Increase default timeout for ART gcstress tests" am: e6d11bbbc6 am: 4644759d4c Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1711925 Change-Id: I4bfeab6af87ae882af88a66560850f0d821244b2
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java index fa9882d..f36da99 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java
@@ -82,7 +82,7 @@ public class TestOptions { /** Default timeout value for various operations. */ - public static final int DEFAULT_TIMEOUT = 1 * 60 * 1000; // 1 minute + public static final int DEFAULT_TIMEOUT = 2 * 60 * 1000; // 2 minutes /** Default time interval for waiting for various events. */ public static final int DEFAULT_WAITING_TIME = DEFAULT_TIMEOUT;