summaryrefslogtreecommitdiffstats
path: root/expectations
diff options
context:
space:
mode:
authorNeil Fuller <nfuller@google.com>2014-07-31 13:26:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-07-31 13:26:37 +0000
commit3b8f0286509a116326dc5d65fcbed1c93f85d2a4 (patch)
tree2e2805758def0b6246902eb7a18a6334492916d8 /expectations
parentc2636f5a0d0abe98f2ceaa39cd7d4e30bb642f81 (diff)
parentf814c4f5445887275d9d58d21843e6d80fbdae27 (diff)
downloadlibcore-3b8f0286509a116326dc5d65fcbed1c93f85d2a4.zip
libcore-3b8f0286509a116326dc5d65fcbed1c93f85d2a4.tar.gz
libcore-3b8f0286509a116326dc5d65fcbed1c93f85d2a4.tar.bz2
am f814c4f5: Merge "Fix the OOME in ScannerParseLargeFileBenchmarkTest"
* commit 'f814c4f5445887275d9d58d21843e6d80fbdae27': Fix the OOME in ScannerParseLargeFileBenchmarkTest
Diffstat (limited to 'expectations')
-rw-r--r--expectations/knownfailures.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 94b1a59..7968c51 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -1374,6 +1374,11 @@
]
},
{
+ description: "ScannerParseLargeFileBenchmark can cause a failure due to a timeout",
+ bug: 14865710,
+ name: "org.apache.harmony.tests.java.util.ScannerParseLargeFileBenchmarkTest"
+},
+{
description: "Known failure in GregorianCalendarTest",
bug: 12778197,
name: "org.apache.harmony.tests.java.util.GregorianCalendarTest#test_computeTime"