p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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 cf7fbcd03d)

Change-Id: I1d28f91cfca098ccdcd62e88bb486b433d9c29d8
This commit is contained in:
Narayan Kamath 2015-06-01 14:45:55 +01:00
parent 3a35aa1a2c
commit 6ca9b2b1a3
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/tasks/cts.mk
View File

@ -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)