am 4e8e998e: am 989fade3: am af44485f: merge from open-source froyo
Merge commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'
* commit '4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
Include Test Case List from CTS Project
diff --git a/core/tasks/cts.mk b/core/tasks/cts.mk
index 46c168b..c5e7966 100644
--- a/core/tasks/cts.mk
+++ b/core/tasks/cts.mk
@@ -37,59 +37,8 @@
android.core.tests.xml \
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 := $(cts_dir)/$(cts_name)/resource/plans