diff options
| author | Keun young Park <keunyoung@google.com> | 2013-01-10 14:11:35 -0800 |
|---|---|---|
| committer | Keun young Park <keunyoung@google.com> | 2013-01-11 09:42:28 -0800 |
| commit | d93d0d1ccca8df219d9778ea8ec1a0472e46eaca (patch) | |
| tree | ff73a2bdefa380e794dcae2a835e8456ac5adae6 /build/test_package.mk | |
| parent | 7cc1bd4c2d189816e6ba3f2bd4602a6fb657ec00 (diff) | |
| download | platform_cts-d93d0d1ccca8df219d9778ea8ec1a0472e46eaca.tar.gz platform_cts-d93d0d1ccca8df219d9778ea8ec1a0472e46eaca.tar.bz2 platform_cts-d93d0d1ccca8df219d9778ea8ec1a0472e46eaca.zip | |
merge PTS into CTS package
- pts still have its own package list : PtsBenchmarkingList
- except that all others are relying on CTS
- CTS plan now includes PTS
- SDK plan corresponds to the old CTS (no PTS)
- No more distinction of PTS / CTS mode in several places
Change-Id: Ifb2245880a92e0d37a57591f41cdb840010e36a4
Diffstat (limited to 'build/test_package.mk')
| -rw-r--r-- | build/test_package.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/test_package.mk b/build/test_package.mk index 071acee6c1d..aa9a4ddf428 100644 --- a/build/test_package.mk +++ b/build/test_package.mk @@ -35,7 +35,12 @@ $(cts_package_apk): $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/pac $(cts_package_xml): PRIVATE_PATH := $(LOCAL_PATH) $(cts_package_xml): PRIVATE_INSTRUMENTATION := $(LOCAL_INSTRUMENTATION_FOR) $(cts_package_xml): PRIVATE_PACKAGE := $(LOCAL_PACKAGE_NAME) -$(cts_package_xml): PRIVATE_TEST_PACKAGE := android.$(notdir $(LOCAL_PATH)) +ifneq ($(filter cts/suite/pts/%, $(LOCAL_PATH)),) # PTS +PRIVATE_CTS_TEST_PACKAGE_NANE_ := com.android.pts.$(notdir $(LOCAL_PATH)) +else # CTS +PRIVATE_CTS_TEST_PACKAGE_NANE_ := android.$(notdir $(LOCAL_PATH)) +endif # PTS +$(cts_package_xml): PRIVATE_TEST_PACKAGE := $(PRIVATE_CTS_TEST_PACKAGE_NANE_) $(cts_package_xml): PRIVATE_MANIFEST := $(LOCAL_PATH)/AndroidManifest.xml $(cts_package_xml): PRIVATE_TEST_TYPE := $(if $(LOCAL_CTS_TEST_RUNNER),$(LOCAL_CTS_TEST_RUNNER),'') $(cts_package_xml): $(call intermediates-dir-for,APPS,$(LOCAL_PACKAGE_NAME))/package.apk $(CTS_EXPECTATIONS) $(CTS_JAVA_TEST_SCANNER_DOCLET) $(CTS_JAVA_TEST_SCANNER) $(CTS_XML_GENERATOR) |