Add apache-xml to boot class path for tests.
And partially revert
7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5
and fully revert
d4291d68c5dffd992ed8d46d0785d24a5da80026
to re-enable tests.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Test: run-libcore-tests --mode=host --variant=X64
Test: run-jdwp-tests --mode=host --variant=X64
Test: run-libcore-tests --mode=target --variant=X64
Test: run-jdwp-tests --mode=target --variant=X64
Bug: 120526172
Change-Id: I5af4853cae84bfc4807d98668b2da2fd9c5fc22e
diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 1880726..5208d64 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -74,7 +74,7 @@
TARGET_CORE_IMG_LOCATION := $(ART_TARGET_TEST_OUT)/core.art
# Modules to compile for core.art.
-CORE_IMG_JARS := core-oj core-libart core-simple okhttp bouncycastle
+CORE_IMG_JARS := core-oj core-libart core-simple okhttp bouncycastle apache-xml
HOST_CORE_IMG_JARS := $(addsuffix -hostdex,$(CORE_IMG_JARS))
TARGET_CORE_IMG_JARS := $(addsuffix -testdex,$(CORE_IMG_JARS))
HOST_CORE_IMG_DEX_LOCATIONS := $(foreach jar,$(HOST_CORE_IMG_JARS), $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)
diff --git a/libartbase/base/common_art_test.cc b/libartbase/base/common_art_test.cc
index 46724ee..53afea2 100644
--- a/libartbase/base/common_art_test.cc
+++ b/libartbase/base/common_art_test.cc
@@ -338,6 +338,7 @@
"core-simple",
"okhttp",
"bouncycastle",
+ "apache-xml",
// Additional modules.
"conscrypt",
};
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 4c31ee5..4e39d09 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -551,7 +551,7 @@
# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
# because that's what we use for compiling the core.art image.
# It may contain additional modules from TEST_CORE_JARS.
-bpath_modules="core-oj core-libart core-simple okhttp bouncycastle conscrypt"
+bpath_modules="core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt"
if [ "${HOST}" = "y" ]; then
framework="${ANDROID_HOST_OUT}/framework"
if [ "${ANDROID_HOST_OUT:0:${#ANDROID_BUILD_TOP}+1}" = "${ANDROID_BUILD_TOP}/" ]; then
diff --git a/tools/libcore_failures.txt b/tools/libcore_failures.txt
index f97dd4f..c66f71d 100644
--- a/tools/libcore_failures.txt
+++ b/tools/libcore_failures.txt
@@ -155,41 +155,6 @@
bug: 25437292
},
{
- description: "Missing resource in classpath",
- result: EXEC_FAILED,
- names: ["libcore.java.util.prefs.OldAbstractPreferencesTest#testClear",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testExportNode",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testExportSubtree",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGet",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetBoolean",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetByteArray",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetDouble",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetFloat",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetInt",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testGetLong",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testKeys",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testNodeExists",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPut",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutBoolean",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutByteArray",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutDouble",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutFloat",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutInt",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testPutLong",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testRemove",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testRemoveNode",
- "libcore.java.util.prefs.OldAbstractPreferencesTest#testSync",
- "libcore.java.util.prefs.PreferencesTest#testHtmlEncoding",
- "libcore.java.util.prefs.PreferencesTest#testPreferencesClobbersExistingFiles",
- "org.apache.harmony.tests.java.util.PropertiesTest#test_storeToXMLLjava_io_OutputStreamLjava_lang_StringLjava_lang_String",
- "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testExportNode",
- "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testExportSubtree",
- "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testFlush",
- "org.apache.harmony.tests.java.util.prefs.AbstractPreferencesTest#testSync",
- "org.apache.harmony.tests.java.util.prefs.FilePreferencesImplTest#testPutGet"],
- bug: 120526172
-},
-{
description: "Only work with --mode=activity",
result: EXEC_FAILED,
names: [ "libcore.java.io.FileTest#testJavaIoTmpdirMutable" ]
diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh
index c85a5ed..c7503bb 100755
--- a/tools/run-jdwp-tests.sh
+++ b/tools/run-jdwp-tests.sh
@@ -58,7 +58,7 @@
# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
# because that's what we use for compiling the core.art image.
# It may contain additional modules from TEST_CORE_JARS.
-BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle conscrypt"
+BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt"
vm_args=""
art="$android_root/bin/art"
diff --git a/tools/run-libcore-tests.sh b/tools/run-libcore-tests.sh
index 63fe81b..68c4fd8 100755
--- a/tools/run-libcore-tests.sh
+++ b/tools/run-libcore-tests.sh
@@ -60,7 +60,7 @@
# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
# because that's what we use for compiling the core.art image.
# It may contain additional modules from TEST_CORE_JARS.
-BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle conscrypt"
+BOOT_CLASSPATH_JARS="core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt"
DEPS="core-tests jsr166-tests mockito-target"