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
Change-Id: I44348052d20312d478bdbf6df0e561db63e18cd8

diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index c7e4ed6..56a7f6f 100644 (file)
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -216,7 +216,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)