summaryrefslogtreecommitdiffstats
path: root/expectations
diff options
context:
space:
mode:
authorJesse Wilson <jessewilson@google.com>2011-01-13 10:38:10 -0800
committerJesse Wilson <jessewilson@google.com>2011-01-13 10:38:10 -0800
commit2190147cd870545879fd7d87fa8baf2147171370 (patch)
treed306eeab72267a74b449277f61ac4eedc9b56552 /expectations
parent6d3ada10746bf4718b84963934630eb3506d8d7a (diff)
parentd6cb085299ff68ba53d537705f84a497a8b8d28a (diff)
downloadlibcore-2190147cd870545879fd7d87fa8baf2147171370.zip
libcore-2190147cd870545879fd7d87fa8baf2147171370.tar.gz
libcore-2190147cd870545879fd7d87fa8baf2147171370.tar.bz2
resolved conflicts for merge of d6cb0852 to dalvik-dev
Change-Id: Icaa0510c3ff7be336cf93c1c31604ef379b921ae
Diffstat (limited to 'expectations')
-rw-r--r--expectations/knownfailures.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index 54510bf..9b60457 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -12,6 +12,12 @@
bug: 3325799
},
{
+ description: "URLConnection fails on URLs containing {}",
+ name: "libcore.java.net.URLConnectionTest#testMalformedUrl",
+ bug: 1158780,
+ substring: "java.net.URISyntaxException"
+},
+{
description: "Test regression",
name: "libcore.javax.crypto.spec.KeyFactoryTestDSA#testKeyFactory",
substring: "not implemented yet",