diff --git a/Android.mk b/Android.mk index 4251262c24a491587259cad9c692e7e07c4fb7ae..dbcc97b065a66883123c667957d8fd4b9d34faf5 100644 --- a/Android.mk +++ b/Android.mk @@ -14,6 +14,7 @@ # limitations under the License. # +include cts/suite/pts/PtsBenchmarkingList.mk include cts/CtsBuild.mk include cts/CtsCoverage.mk include $(call all-subdir-makefiles) diff --git a/CtsCoverage.mk b/CtsCoverage.mk index 4689bae342b451b4c5e55615d2e52561281e59af..21d46d193d9896006308302a813a20dd5e850b50 100644 --- a/CtsCoverage.mk +++ b/CtsCoverage.mk @@ -28,26 +28,41 @@ api_text_description := frameworks/base/api/current.txt api_xml_description := $(coverage_out)/api.xml $(api_xml_description) : $(api_text_description) $(APICHECK) $(hide) echo "Converting API file to XML: $@" - $(hide) mkdir -p $(coverage_out) - $(hide) $(APICHECK_COMMAND) -convert2xml $(api_text_description) $(api_xml_description) + $(hide) mkdir -p $(dir $@) + $(hide) $(APICHECK_COMMAND) -convert2xml $< $@ cts-test-coverage-report := $(coverage_out)/test-coverage.html cts-verifier-coverage-report := $(coverage_out)/verifier-coverage.html cts-combined-coverage-report := $(coverage_out)/combined-coverage.html -cts_api_coverage_dependencies := $(cts_api_coverage_exe) $(dexdeps_exe) $(api_xml_description) $(ACP) +cts_api_coverage_dependencies := $(cts_api_coverage_exe) $(dexdeps_exe) $(api_xml_description) -$(cts-test-coverage-report) : $(CTS_COVERAGE_TEST_CASE_LIST) $(cts_api_coverage_dependencies) +cts_coverage_test_cases_dependencies := $(foreach c, $(CTS_COVERAGE_TEST_CASE_LIST), $(call intermediates-dir-for,APPS,$(c))/package.apk) +$(cts-test-coverage-report): PRIVATE_TEST_CASES_APKS := $(cts_coverage_test_cases_dependencies) +$(cts-test-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe) +$(cts-test-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe) +$(cts-test-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description) +$(cts-test-coverage-report) : $(cts_coverage_test_cases_dependencies) $(cts_api_coverage_dependencies) | $(ACP) $(call generate-coverage-report,"CTS Tests API Coverage Report",\ - $(CTS_COVERAGE_TEST_CASE_LIST),cts-test-apks,html,test-coverage.html) - -$(cts-verifier-coverage-report) : CtsVerifier $(cts_api_coverage_dependencies) + $(PRIVATE_TEST_CASES_APKS),html) + +cts_coverage_test_cases_dependencies := $(call intermediates-dir-for,APPS,CtsVerifier)/package.apk +$(cts-verifier-coverage-report): PRIVATE_TEST_CASES_APKS := $(cts_coverage_test_cases_dependencies) +$(cts-verifier-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe) +$(cts-verifier-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe) +$(cts-verifier-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description) +$(cts-verifier-coverage-report) : $(cts_coverage_test_cases_dependencies) $(cts_api_coverage_dependencies) | $(ACP) $(call generate-coverage-report,"CTS Verifier API Coverage Report",\ - CtsVerifier,cts-verifier-apks,html,verifier-coverage.html) - -$(cts-combined-coverage-report) : CtsVerifier $(cts_api_coverage_dependencies) $(CTS_COVERAGE_TEST_CASE_LIST) $(cts_api_coverage_dependencies) + $(PRIVATE_TEST_CASES_APKS),html) + +cts_coverage_test_cases_dependencies := $(foreach c, $(CTS_COVERAGE_TEST_CASE_LIST) CtsVerifier, $(call intermediates-dir-for,APPS,$(c))/package.apk) +$(cts-combined-coverage-report): PRIVATE_TEST_CASES_APKS := $(cts_coverage_test_cases_dependencies) +$(cts-combined-coverage-report): PRIVATE_CTS_API_COVERAGE_EXE := $(cts_api_coverage_exe) +$(cts-combined-coverage-report): PRIVATE_DEXDEPS_EXE := $(dexdeps_exe) +$(cts-combined-coverage-report): PRIVATE_API_XML_DESC := $(api_xml_description) +$(cts-combined-coverage-report) : $(cts_coverage_test_cases_dependencies) $(cts_api_coverage_dependencies) | $(ACP) $(call generate-coverage-report,"CTS Combined API Coverage Report",\ - $(CTS_COVERAGE_TEST_CASE_LIST) CtsVerifier,cts-combined-apks,html,combined-coverage.html) + $(PRIVATE_TEST_CASES_APKS),html) .PHONY: cts-test-coverage cts-test-coverage : $(cts-test-coverage-report) @@ -67,17 +82,22 @@ endif # Arguments; # 1 - Name of the report printed out on the screen -# 2 - Name of APK packages that will be scanned to generate the report -# 3 - Name of variable to hold the calculated paths of the APKs -# 4 - Format of the report -# 5 - Output file name of the report +# 2 - List of apk files that will be scanned to generate the report +# 3 - Format of the report define generate-coverage-report - $(foreach testcase,$(2),$(eval $(call add-testcase-apk,$(3),$(testcase)))) - $(hide) mkdir -p $(coverage_out) - $(hide) $(cts_api_coverage_exe) -d $(dexdeps_exe) -a $(api_xml_description) -f $(4) -o $(coverage_out)/$(5) $($(3)) - $(hide) echo $(1): file://$(ANDROID_BUILD_TOP)/$(coverage_out)/$(5) + $(hide) mkdir -p $(dir $@) + $(hide) $(PRIVATE_CTS_API_COVERAGE_EXE) -d $(PRIVATE_DEXDEPS_EXE) -a $(PRIVATE_API_XML_DESC) -f $(3) -o $@ $(2) + @ echo $(1): file://$(ANDROID_BUILD_TOP)/$@ endef -define add-testcase-apk - $(1) += $(call intermediates-dir-for,APPS,$(2))/package.apk -endef +# Reset temp vars +cts_api_coverage_dependencies := +cts_coverage_test_cases_dependencies := +cts-combined-coverage-report := +cts-verifier-coverage-report := +cts-test-coverage-report := +api_xml_description := +api_text_description := +coverage_out := +dexdeps_exe := +cts_api_coverage_exe := diff --git a/CtsTestCaseList.mk b/CtsTestCaseList.mk index 0b81f8052003c1f6956ad705e25fd7a2a23316d6..5d23eb5916888f15c37fe3ce975a7e16d2ae067c 100644 --- a/CtsTestCaseList.mk +++ b/CtsTestCaseList.mk @@ -19,6 +19,7 @@ cts_security_apps_list := \ CtsInstrumentationAppDiffCert \ CtsPermissionDeclareApp \ CtsPermissionDeclareAppCompat \ + CtsReadExternalStorageApp \ CtsSharedUidInstall \ CtsSharedUidInstallDiffCert \ CtsSimpleAppInstall \ @@ -29,6 +30,7 @@ cts_security_apps_list := \ CtsMultiUserStorageApp cts_support_packages := \ + $(PTS_SUPPORT_PACKAGES) \ CtsAccelerationTestStubs \ CtsDeviceAdmin \ CtsMonkeyApp \ @@ -38,6 +40,7 @@ cts_support_packages := \ SignatureTest \ TestDeviceSetup \ CtsUiAutomatorApp \ + CtsUsbSerialTestApp \ $(cts_security_apps_list) cts_external_packages := \ @@ -51,6 +54,7 @@ CTS_TEST_CASE_LIST := \ # Test packages that require an associated test package XML. cts_test_packages := \ + $(PTS_TEST_PACKAGES) \ CtsAccelerationTestCases \ CtsAccountManagerTestCases \ CtsAccessibilityServiceTestCases \ @@ -91,6 +95,8 @@ cts_test_packages := \ CtsPreference2TestCases \ CtsProviderTestCases \ CtsRenderscriptTestCases \ + CtsRenderscriptGraphicsTestCases \ + CtsRsCppTestCases \ CtsSaxTestCases \ CtsSecurityTestCases \ CtsSpeechTestCases \ @@ -111,9 +117,11 @@ CTS_COVERAGE_TEST_CASE_LIST := \ # Host side only tests cts_host_libraries := \ + $(PTS_HOST_CASES) \ CtsAdbTests \ CtsAppSecurityTests \ - CtsMonkeyTestCases + CtsMonkeyTestCases \ + CtsUsbTests # Native test executables that need to have associated test XMLs. @@ -123,14 +131,15 @@ cts_native_exes := \ bionic-unit-tests-cts \ cts_ui_tests := \ - CtsUiAutomatorTests + CtsUiAutomatorTests # All the files that will end up under the repository/testcases # directory of the final CTS distribution. CTS_TEST_CASES := $(call cts-get-lib-paths,$(cts_host_libraries)) \ $(call cts-get-package-paths,$(cts_test_packages)) \ $(call cts-get-native-paths,$(cts_native_exes)) \ - $(call cts-get-ui-lib-paths,$(cts_ui_tests)) + $(call cts-get-ui-lib-paths,$(cts_ui_tests)) \ + $(call cts-get-ui-lib-paths,$(pts_device_lib_tests)) # All the XMLs that will end up under the repository/testcases # and that need to be created before making the final CTS distribution. diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml index 88c5069c3de1ed5b5439d5c06bde229871c0b973..b9f7ceb450f1ea527c8be8dff20cd3771040eb1b 100644 --- a/apps/CtsVerifier/AndroidManifest.xml +++ b/apps/CtsVerifier/AndroidManifest.xml @@ -18,10 +18,10 @@ + android:versionName="4.4_r0"> - - + + @@ -41,6 +41,8 @@ + + @@ -52,7 +54,6 @@ android:debuggable="true" android:largeHeap="true"> - @@ -88,6 +89,9 @@ + + + @@ -354,7 +358,7 @@ - + - + + + + + + + + + + + + + + + @@ -462,6 +482,15 @@ + + + + + + + + diff --git a/apps/CtsVerifier/assets/myCA.cer b/apps/CtsVerifier/assets/myCA.cer new file mode 100644 index 0000000000000000000000000000000000000000..3b98d3e48144550a0bde30b7f6c3efa27981a973 Binary files /dev/null and b/apps/CtsVerifier/assets/myCA.cer differ diff --git a/apps/CtsVerifier/res/layout/ca_boot_notify.xml b/apps/CtsVerifier/res/layout/ca_boot_notify.xml new file mode 100644 index 0000000000000000000000000000000000000000..29fa549b92d83a0715f16a69dd82cc70df594064 --- /dev/null +++ b/apps/CtsVerifier/res/layout/ca_boot_notify.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + +