summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Muramatsu <btmura@android.com>2010-07-22 14:46:53 -0700
committerBrian Muramatsu <btmura@android.com>2010-07-22 14:46:53 -0700
commitfa3d88f8845b1db42da4886faff93db2b53cfcf1 (patch)
treee050b89fb9eec3f2cc172d8fde61d247ba9d3e86
parenta0cb466645ccc88d4f6d1f83018d5a0daf2eec6a (diff)
downloadbuild-fa3d88f8845b1db42da4886faff93db2b53cfcf1.zip
build-fa3d88f8845b1db42da4886faff93db2b53cfcf1.tar.gz
build-fa3d88f8845b1db42da4886faff93db2b53cfcf1.tar.bz2
Include Test Case List from CTS Project
Bug 2732160 Have the cts.mk include the test case list from CTS rather than defining it in cts.mk. This permits CTS developers to add new packages and applications without having to submit multiple project changes to both the CTS and build projects everytime. Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
-rw-r--r--core/tasks/cts.mk55
1 files changed, 2 insertions, 53 deletions
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 8f60d94..1568494 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -50,59 +50,8 @@ CTS_CORE_CASE_LIST := android.core.tests.annotation \
android.core.tests.xnet \
android.core.tests.runner
-CTS_SECURITY_APPS_LIST := \
- CtsAppAccessData \
- CtsAppWithData \
- CtsInstrumentationAppDiffCert \
- CtsPermissionDeclareApp \
- CtsSharedUidInstall \
- CtsSharedUidInstallDiffCert \
- CtsSimpleAppInstall \
- CtsSimpleAppInstallDiffCert \
- CtsTargetInstrumentationApp \
- CtsUsePermissionDiffCert
-
-CTS_CASE_LIST := \
- TestDeviceSetup \
- CtsTestStubs \
- CtsAccessibilityServiceTestCases \
- CtsAccountManagerTestCases \
- CtsAppTestCases \
- CtsBluetoothTestCases \
- CtsContentTestCases \
- CtsDatabaseTestCases \
- CtsDelegatingAccessibilityService \
- CtsDpiTestCases \
- CtsDpiTestCases2 \
- CtsExampleTestCases \
- CtsGestureTestCases \
- CtsGraphicsTestCases \
- CtsHardwareTestCases \
- CtsJniTestCases \
- CtsLocationTestCases \
- CtsMediaTestCases \
- CtsOsTestCases \
- CtsPermissionTestCases \
- CtsPermission2TestCases \
- CtsProviderTestCases \
- CtsSpeechTestCases \
- CtsTelephonyTestCases \
- CtsTextTestCases \
- CtsUtilTestCases \
- CtsViewTestCases \
- CtsWebkitTestCases \
- CtsWidgetTestCases \
- CtsNetTestCases \
- SignatureTest \
- CtsPerformanceTestCases \
- CtsPerformance2TestCases \
- CtsPerformance3TestCases \
- CtsPerformance4TestCases \
- CtsPerformance5TestCases \
- ApiDemos \
- ApiDemosReferenceTest \
- $(CTS_CORE_CASE_LIST) \
- $(CTS_SECURITY_APPS_LIST)
+-include cts/CtsTestCaseList.mk
+CTS_CASE_LIST := $(CTS_CORE_CASE_LIST) $(CTS_TEST_CASE_LIST)
DEFAULT_TEST_PLAN := $(PRIVATE_DIR)/resource/plans