diff options
| author | Neil Fuller <nfuller@google.com> | 2014-05-19 10:28:31 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-05-19 10:28:31 +0100 |
| commit | 654774fd066fc03fb6f3f7630958ae0690458c4a (patch) | |
| tree | 8495f901f7c59f96ffc4013d88b93db4638f5fe8 /expectations/brokentests.txt | |
| parent | 3eb955e943f7ad89cd262be961f86e24adc5969f (diff) | |
| parent | 12d8a41e357aedab33c4afe77e0c29b00185fe9f (diff) | |
| download | libcore-654774fd066fc03fb6f3f7630958ae0690458c4a.zip libcore-654774fd066fc03fb6f3f7630958ae0690458c4a.tar.gz libcore-654774fd066fc03fb6f3f7630958ae0690458c4a.tar.bz2 | |
Merge commit '12d8a41e' into manualmerge
Removed all X509CertificateNistPkitsTest changes
as part of the merge. I will investigate the state
of these tests separately.
Conflicts:
expectations/knownfailures.txt
Change-Id: Ie9bc0b3ac89cc5be2733b677a1bfe20253bf101f
Diffstat (limited to 'expectations/brokentests.txt')
| -rw-r--r-- | expectations/brokentests.txt | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt index b7ec563..2911ed5 100644 --- a/expectations/brokentests.txt +++ b/expectations/brokentests.txt @@ -8,11 +8,6 @@ bug: 5834665 }, { - description: "FIONREAD/SIOCINQ returns the wrong result on sockets (5731252 is the root cause of 5534202)", - name: "libcore.java.net.SocketTest#testAvailable", - bug: 5731252 -}, -{ description: "libcore.java.net.URLConnectionTest#testServerShutdownInput fails on ICL27 mysid-userdebug (5534202 is caused by 5731252)", name: "libcore.java.net.URLConnectionTest#testServerShutdownInput", bug: 5534202 |