summaryrefslogtreecommitdiffstats
path: root/harmony-tests
diff options
context:
space:
mode:
authorMathieu Chartier <mathieuc@google.com>2015-01-13 19:11:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-13 19:11:53 +0000
commit6e3262f89ee6b2eb5ff6cca2d70cd1d210857e34 (patch)
tree96e67239810b0ea1749b5dea79f8943042179b37 /harmony-tests
parentf05f989bdeed23225f05744b9b942ac7b85dfc50 (diff)
parent0311cd2be856e4c5872ebbe5ac7e12eac334ad73 (diff)
downloadlibcore-6e3262f89ee6b2eb5ff6cca2d70cd1d210857e34.zip
libcore-6e3262f89ee6b2eb5ff6cca2d70cd1d210857e34.tar.gz
libcore-6e3262f89ee6b2eb5ff6cca2d70cd1d210857e34.tar.bz2
am 0311cd2b: Increase ThreadTest tolerance
* commit '0311cd2be856e4c5872ebbe5ac7e12eac334ad73': Increase ThreadTest tolerance
Diffstat (limited to 'harmony-tests')
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java
index 19c6229..c971e99 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java
@@ -234,10 +234,10 @@ public class ThreadsTest extends TestCase {
* Allow a bit more slop for the maximum on "expected
* instantaneous" results.
*/
- long minimum = (long) ((double) expectedMillis * 0.90);
+ long minimum = (long) ((double) expectedMillis * 0.80);
long maximum =
- Math.max((long) ((double) expectedMillis * 1.10), 10);
- long waitMillis = Math.max(expectedMillis * 10, 10);
+ Math.max((long) ((double) expectedMillis * 1.20), 10);
+ long waitMillis = Math.max(expectedMillis * 10, 30);
long duration = getDurationMillis(waitMillis);
if (duration < minimum) {