From 6ca9b2b1a381056670f6bae058fe2463c9a1c523 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Mon, 1 Jun 2015 14:45:55 +0100 Subject: [PATCH] Remove duplicate CTS tests from libcore cts packages. The catch all "org" package was catching several thousand org.apache.harmony.tests.* tests that are already covered by other packages. Replace the catch-all org.* with specific prefixes. Needs additional support in CollectAllTests to handle multiple prefixes. This is implemented in the companion change. bug: 20862863 (cherry picked from commit cf7fbcd03d9f13d1c2fe6e65f02247feadec136d) Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8 --- core/tasks/cts.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk index a1fe4e8afa..4c82ada031 100644 --- a/core/tasks/cts.mk +++ b/core/tasks/cts.mk @@ -212,7 +212,16 @@ $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.org.xml: $(CTS_CORE_XMLS $(hide) mkdir -p $(CTS_TESTCASES_OUT) $(call generate-core-test-description,$(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.org,\ cts/tests/core/libcore/org/AndroidManifest.xml,\ - $(CORETESTS_INTERMEDIATES)/javalib.jar,org,\ + $(CORETESTS_INTERMEDIATES)/javalib.jar,\ + org.w3c.domts:\ + org.apache.harmony.security.tests:\ + org.apache.harmony.nio.tests:\ + org.apache.harmony.crypto.tests:\ + org.apache.harmony.regex.tests:\ + org.apache.harmony.luni.tests:\ + org.apache.harmony.tests.internal.net.www.protocol:\ + org.apache.harmony.tests.javax.net:\ + org.json,\ $(TARGET_ARCH),libcore/expectations) $(CTS_TESTCASES_OUT)/android.core.tests.libcore.package.libcore.xml: $(CTS_CORE_XMLS_DEPS)