diff options
| author | Neil Fuller <nfuller@google.com> | 2014-06-04 15:19:17 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-06-04 15:19:17 +0100 |
| commit | 29563b580f1d66b1e7e803f15b2cd7ea111e8838 (patch) | |
| tree | 06a5d5f5f11f796c07f7229e11f703dd16640450 /expectations/knownfailures.txt | |
| parent | a87d87cd6e6c10e7a7b7f6db25390038a882d37d (diff) | |
| parent | 2a7d8be01642855f1af0232d4e519fca61fd045d (diff) | |
| download | libcore-29563b580f1d66b1e7e803f15b2cd7ea111e8838.tar.gz libcore-29563b580f1d66b1e7e803f15b2cd7ea111e8838.tar.bz2 libcore-29563b580f1d66b1e7e803f15b2cd7ea111e8838.zip | |
resolved conflicts for merge of 2a7d8be0 to master
Change-Id: I05820029b34ad9d6c0b43ee2baf006f64e0a5942
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 bc334378e..77f688118 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1465,5 +1465,10 @@ "com.squareup.okhttp.internal.spdy.SpdyConnectionTest#replyWithNoData", "com.squareup.okhttp.internal.spdy.SpdyConnectionTest#serverClosesClientInputStream" ] +}, +{ + description: "Large test that ends in a timeout during CTS runs", + bug: 5513723, + name: "libcore.java.security.KeyPairGeneratorTest#test_getInstance" } ] |