summaryrefslogtreecommitdiffstats
path: root/core/tasks
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2010-07-26 12:06:35 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-07-26 12:06:35 -0700
commit989fade304ef5253b5b401f347e26f768d75f35f (patch)
tree650b23b79f799a1693b64ea1b9e5bb062ecaf8b6 /core/tasks
parentf2bfa76cf8937cb98b0205da1ed7f8267bd5714b (diff)
parentaf44485fe83bb36a9d55fb54a8f5362854dd7b10 (diff)
downloadbuild-989fade304ef5253b5b401f347e26f768d75f35f.zip
build-989fade304ef5253b5b401f347e26f768d75f35f.tar.gz
build-989fade304ef5253b5b401f347e26f768d75f35f.tar.bz2
am af44485f: merge from open-source froyo
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread * commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10': Include Test Case List from CTS Project
Diffstat (limited to 'core/tasks')
-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