diff options
| author | Narayan Kamath <narayan@google.com> | 2014-05-12 10:41:53 +0100 |
|---|---|---|
| committer | Narayan Kamath <narayan@google.com> | 2014-05-12 10:41:53 +0100 |
| commit | 9a000495e89271419ab9dff9b581745e3581be5d (patch) | |
| tree | 521986d69421666c764ae55b803ece1ee08e9941 /expectations/knownfailures.txt | |
| parent | 2bea99ca48f71755d79205e02b0d4ccc44d33c80 (diff) | |
| parent | 2b6c9f5506aaa53cf7003585077a9b9b57bd685b (diff) | |
| download | libcore-9a000495e89271419ab9dff9b581745e3581be5d.zip libcore-9a000495e89271419ab9dff9b581745e3581be5d.tar.gz libcore-9a000495e89271419ab9dff9b581745e3581be5d.tar.bz2 | |
resolved conflicts for merge of 2b6c9f55 to master
Change-Id: I7bd8df2f8679fe85bb95a371fc9cc564581fa29b
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 01f6d91..1c3ccec 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1654,5 +1654,10 @@ "org.apache.harmony.tests.java.net.URLTest#test_sameFileLjava_net_URL", "org.apache.harmony.tests.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String" ] +}, +{ + description: "Known failure in GregorianCalendarTest", + bug: 12778197, + name: "org.apache.harmony.tests.java.util.GregorianCalendarTest#test_computeTime" } ] |