diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2017-12-10 15:18:47 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-10 15:18:47 +0000 |
| commit | 3ec0d9b4bbc163b6496858f8b7e8366e727dd15a (patch) | |
| tree | f7056478768fed56bb2c9ebd6ba9b8e98dfb9934 | |
| parent | 186f61692febe7e44b1f0935baa633afc191e6cf (diff) | |
| parent | 20c9fab04ad915cbe30c6f2d5d27effc15a2aeaf (diff) | |
| download | apache-harmony-3ec0d9b4bbc163b6496858f8b7e8366e727dd15a.tar.gz | |
Merge "Revert "Increase timings again."" am: 0ffd9827fc am: ded1b838f9
am: 20c9fab04a
Change-Id: I417d4657eb91c27b77aafa4612f9d7ed5ea8e822
| -rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugDebuggee.java | 6 | ||||
| -rw-r--r-- | jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugTest.java | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugDebuggee.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugDebuggee.java index cfc3d51..20063b5 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugDebuggee.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugDebuggee.java @@ -28,7 +28,7 @@ import org.apache.harmony.jpda.tests.share.SyncDebuggee; * This class provides a test for VMDebug functions. */ public class VMDebugDebuggee extends SyncDebuggee { - public static final long SLEEP_TIME = 40; + public static final long SLEEP_TIME = 20; public static final class DebugResult implements Serializable { public boolean error_occured = false; @@ -83,8 +83,8 @@ public class VMDebugDebuggee extends SyncDebuggee { boolean is_debugging_enabled = false; long last_debugger_activity = -1; try { - // Wait 40 milliseconds so that last_debugger_activity will be non-zero and definitely - // more than 20. + // Wait 20 milliseconds so that last_debugger_activity will be non-zero and definitely + // more than 10. Thread.sleep(SLEEP_TIME); Class<?> vmdebug = Class.forName("dalvik.system.VMDebug"); diff --git a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugTest.java b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugTest.java index 2f5e97c..2e37f72 100644 --- a/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugTest.java +++ b/jdwp/src/test/java/org/apache/harmony/jpda/tests/jdwp/VMDebug/VMDebugTest.java @@ -30,9 +30,9 @@ import org.apache.harmony.jpda.tests.share.JPDADebuggeeSynchronizer; * JDWP Unit test for VMDebug functions command */ public class VMDebugTest extends JDWPSyncTestCase { - // We slept for 40ms so we should have at least 20ms delta. We don't want to be too exact + // We slept for 20ms so we should have at least 10ms delta. We don't want to be too exact // because timers are annoying. - public static final long EXPECTED_WAIT_TIME = 20; + public static final long EXPECTED_WAIT_TIME = 10; @Override protected String getDebuggeeClassName() { |