summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Brazdil <dbrazdil@google.com>2015-02-24 10:52:45 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-02-24 10:52:45 +0000
commit0b6daeb0f0014474b542cbba1f713eb0dbefb7f9 (patch)
treeae533bfc5539dbbd2929e132186d2398d4322edd
parent69f46525c7238f43eaefdb844106c2e97181c498 (diff)
parente2f28ade08c50492cdc97fee661146db847ab128 (diff)
downloadandroid_art-0b6daeb0f0014474b542cbba1f713eb0dbefb7f9.tar.gz
android_art-0b6daeb0f0014474b542cbba1f713eb0dbefb7f9.tar.bz2
android_art-0b6daeb0f0014474b542cbba1f713eb0dbefb7f9.zip
Merge "ART: Enable more libcore tests (harmony package)"
-rw-r--r--tools/libcore_failures.txt12
-rwxr-xr-xtools/run-libcore-tests.sh7
2 files changed, 18 insertions, 1 deletions
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index 2c921f509d..d74a0cc4cb 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -36,9 +36,13 @@
"libcore.java.util.TimeZoneTest#test_useDaylightTime_Taiwan",
"libcore.java.util.TimeZoneTest#testAllDisplayNames",
"libcore.io.OsTest#testUnixDomainSockets_in_file_system",
+ "org.apache.harmony.luni.tests.java.net.URLConnectionTest#test_setReadTimeoutI",
"org.apache.harmony.tests.java.util.DateTest#test_Constructor",
"org.apache.harmony.tests.java.util.ScannerTest#test_Constructor_LReadableByteChannel",
- "org.apache.harmony.tests.java.util.TimeZoneTest#test_hasSameRules_Ljava_util_TimeZone"]
+ "org.apache.harmony.tests.java.util.TimeZoneTest#test_hasSameRules_Ljava_util_TimeZone",
+ "org.apache.harmony.tests.java.text.ChoiceFormatTest#testEscapedPatternWithConsecutiveQuotes",
+ "org.apache.harmony.tests.java.text.ChoiceFormatTest#testToPatternWithInfinities",
+ "org.apache.harmony.tests.java.text.MessageFormatTest#test19011159"]
},
{
description: "Test timeouts",
@@ -57,5 +61,11 @@
result: EXEC_FAILED,
name: "libcore.icu.DateIntervalFormatTest#test_formatDateInterval",
bug: 18619426
+},
+{
+ description: "Error decoding digital signature bytes.",
+ result: EXEC_FAILED,
+ name: "org.apache.harmony.security.tests.java.security.Signature2Test#test_verify$BII",
+ bug: 18869265
}
]
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 0f08928f98..e25d1b3457 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -41,10 +41,17 @@ working_packages=("libcore.icu"
"libcore.reflect"
"libcore.util"
"org.apache.harmony.annotation"
+ "org.apache.harmony.luni"
+ "org.apache.harmony.nio"
"org.apache.harmony.regex"
+ "org.apache.harmony.security"
+ "org.apache.harmony.testframework"
+ "org.apache.harmony.tests.java.io"
"org.apache.harmony.tests.java.lang"
"org.apache.harmony.tests.java.math"
"org.apache.harmony.tests.java.util"
+ "org.apache.harmony.tests.java.text"
+ "org.apache.harmony.tests.javax.security"
"tests.java.lang.String")
# Run the tests using vogar.