diff options
author | Neil Fuller <nfuller@google.com> | 2014-09-09 21:34:20 +0100 |
---|---|---|
committer | Neil Fuller <nfuller@google.com> | 2014-09-09 21:34:20 +0100 |
commit | 2f17acea4e5dba2fcee3035db376082162632fbc (patch) | |
tree | 91758d02377d64c9ea1b942ebcdc01ff6449ba2b /expectations | |
parent | 71c0342cb4e6433ecee774981e7b55c82021edbb (diff) | |
download | libcore-2f17acea4e5dba2fcee3035db376082162632fbc.zip libcore-2f17acea4e5dba2fcee3035db376082162632fbc.tar.gz libcore-2f17acea4e5dba2fcee3035db376082162632fbc.tar.bz2 |
Remove an erroneous double-merge in the knownfailures.txt file
The original change in AOSP/master and the patch of the same
change in lmp-dev created a monster.
Change-Id: Ib6644022384e03b0dc9a268bb3926505adfccfd6
Diffstat (limited to 'expectations')
-rw-r--r-- | expectations/knownfailures.txt | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt index fc2ab7e..522e83c 100644 --- a/expectations/knownfailures.txt +++ b/expectations/knownfailures.txt @@ -1436,23 +1436,6 @@ ] }, { - description: "java.util.beans: the harmony tests were broken by Android commit 19a270e90b1e992c1f6639f355ae13564c2f3a6a", - bug: 17394106, - names: [ - "com.android.org.apache.harmony.beans.tests.java.beans.PropertyChangeSupportTest#testSerialization", - "com.android.org.apache.harmony.beans.tests.java.beans.PropertyChangeSupportTest#testGetPropertyChangeListener_String_Normal", - "com.android.org.apache.harmony.beans.tests.java.beans.PropertyChangeSupportTest#testAddPropertyChangeListener_PropertyChangeListener_String_Normal", - "com.android.org.apache.harmony.beans.tests.java.beans.PropertyChangeSupportTest#testAddPropertyChangeListener_PropertyChangeListener_Normal" - ] -}, -{ - description: "java.util.beans: the serialized form references org.apache not com.android.org.apache", - bug: 17394106, - names: [ - "com.android.org.apache.harmony.beans.tests.java.beans.PropertyChangeSupportTest#testSerializationCompatibility" - ] -}, -{ description: "Known failure in GregorianCalendarTest", bug: 12778197, name: "org.apache.harmony.tests.java.util.GregorianCalendarTest#test_computeTime" |