From: Narayan Kamath <narayan@google.com>
Date: Mon, 1 Jun 2015 13:45:55 +0000 (+0100)
Subject: Remove duplicate CTS tests from libcore cts packages.
X-Git-Tag: android-x86-6.0-r1~180
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf7fbcd03d9f13d1c2fe6e65f02247feadec136d;p=android-x86%2Fbuild.git

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 c7e4ed64f..56a7f6fd4 100644
--- 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)