diff options
author | Neil Fuller <nfuller@google.com> | 2014-06-04 14:55:01 +0100 |
---|---|---|
committer | Neil Fuller <nfuller@google.com> | 2014-06-04 14:55:01 +0100 |
commit | 2a7d8be01642855f1af0232d4e519fca61fd045d (patch) | |
tree | f2c76a8298bbda16ceed061e309c256bae69b788 /expectations/knownfailures.txt | |
parent | 1163499ceae64096abc0a87a6e7cb9c83412dad9 (diff) | |
parent | 636b8b818c373e2cd4dcddfc90a4e9ed26309045 (diff) | |
download | libcore-2a7d8be01642855f1af0232d4e519fca61fd045d.zip libcore-2a7d8be01642855f1af0232d4e519fca61fd045d.tar.gz libcore-2a7d8be01642855f1af0232d4e519fca61fd045d.tar.bz2 |
resolved conflicts for merge of 636b8b81 to klp-modular-dev-plus-aosp
Change-Id: I4e35620643592ead3d6a786543fe724747b59921
Diffstat (limited to 'expectations/knownfailures.txt')
-rw-r--r-- | expectations/knownfailures.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index e491f59..1e24ecc 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1504,5 +1504,10 @@ description: "Suppression of a test that proves there is a known bug with Matcher", bug: 14865710, name: "org.apache.harmony.tests.java.util.ScannerParseLargeFileBenchmarkTest#testParseLargeFile" +}, +{ + description: "Large test that ends in a timeout during CTS runs", + bug: 5513723, + name: "libcore.java.security.KeyPairGeneratorTest#test_getInstance" } ] |