diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-05-20 23:39:40 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-20 23:39:40 +0000 |
| commit | c07227fe6680ed12601cc1cd6a20aecfad61544e (patch) | |
| tree | d03161a60f9809c4aa971768ac0f24c51ce2ed0f | |
| parent | a7d5a621ea0a81b9ab4c7984174134ca713ee496 (diff) | |
| parent | 2d929f9a77abf600ad593ae46839c56c3f87963c (diff) | |
| download | apache-harmony-c07227fe6680ed12601cc1cd6a20aecfad61544e.tar.gz | |
Merge "Increase default timeout for ART gcstress tests" am: e6d11bbbc6 am: 4644759d4c am: 2d929f9a77
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/1711925
Change-Id: I5a4fdee34bb6812c71eaa158a40da25d42d9e950
| -rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/framework/TestOptions.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ import java.util.HashMap; 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; |