More CTS Coverage Build Improvements
Bug 3245588
The build server couldn't display the XML report with the XSL
transformation. Thus, when you clicked on the XML file, you
would just see the raw XML which wasn't very useful. So make
the report generator output a single HTML file by transforming
the XML into HTML in code.
Change-Id: Ie8b585551e4150f360a6622b3c6f7298ebd0a1e8
diff --git a/CtsTestCoverage.mk b/CtsTestCoverage.mk
index 85f13cc..3d30554 100644
--- a/CtsTestCoverage.mk
+++ b/CtsTestCoverage.mk
@@ -23,29 +23,18 @@
DEXDEPS_EXE := $(HOST_OUT_EXECUTABLES)/dexdeps
COVERAGE_OUT := $(HOST_OUT)/cts/api-coverage
-COVERAGE_RES := cts/tools/cts-api-coverage/res
+cts-test-coverage-report := $(COVERAGE_OUT)/test-coverage.html
+cts-verifier-coverage-report := $(COVERAGE_OUT)/verifier-coverage.html
-cts-test-coverage-report := $(COVERAGE_OUT)/test-coverage.xml
-cts-verifier-coverage-report := $(COVERAGE_OUT)/verifier-coverage.xml
-api-coverage-css := $(COVERAGE_OUT)/api-coverage.css
-api-coverage-xsl := $(COVERAGE_OUT)/api-coverage.xsl
-
-CTS_API_COVERAGE_DEPENDENCIES := $(CTS_API_COVERAGE_EXE) $(DEXDEPS_EXE) $(ACP) \
- $(api-coverage-css) $(api-coverage-xsl)
+CTS_API_COVERAGE_DEPENDENCIES := $(CTS_API_COVERAGE_EXE) $(DEXDEPS_EXE) $(ACP)
$(cts-test-coverage-report) : $(CTS_COVERAGE_TEST_CASE_LIST) $(CTS_API_COVERAGE_DEPENDENCIES)
$(call generate-coverage-report,"CTS Tests API Coverage Report",\
- $(CTS_COVERAGE_TEST_CASE_LIST),xml,$(HOST_OUT)/cts/api-coverage,test-coverage.xml)
+ $(CTS_COVERAGE_TEST_CASE_LIST),html,$(HOST_OUT)/cts/api-coverage,test-coverage.html)
$(cts-verifier-coverage-report) : CtsVerifier $(CTS_API_COVERAGE_DEPENDENCIES)
$(call generate-coverage-report,"CTS Verifier API Coverage Report",\
- CtsVerifier,xml,$(HOST_OUT)/cts/api-coverage,verifier-coverage.xml)
-
-$(api-coverage-css) : $(COVERAGE_RES)/api-coverage.css $(ACP)
- $(call copy-coverage-resource,api-coverage.css,$(api-coverage-css))
-
-$(api-coverage-xsl) : $(COVERAGE_RES)/api-coverage.xsl $(ACP)
- $(call copy-coverage-resource,api-coverage.xsl,$(api-coverage-xsl))
+ CtsVerifier,html,$(HOST_OUT)/cts/api-coverage,verifier-coverage.html)
.PHONY: cts-test-coverage
cts-test-coverage : $(cts-test-coverage-report)
@@ -55,10 +44,8 @@
# Put the test coverage report in the dist dir if "cts" is among the build goals.
ifneq ($(filter cts, $(MAKECMDGOALS)),)
- $(call dist-for-goals, cts, $(cts-test-coverage-report):cts-test-coverage-report.xml)
- $(call dist-for-goals, cts, $(cts-verifier-coverage-report):cts-verifier-coverage-report.xml)
- $(call dist-for-goals, cts, $(api-coverage-css):api-coverage.css)
- $(call dist-for-goals, cts, $(api-coverage-xsl):api-coverage.xsl)
+ $(call dist-for-goals, cts, $(cts-test-coverage-report):cts-test-coverage-report.html)
+ $(call dist-for-goals, cts, $(cts-verifier-coverage-report):cts-verifier-coverage-report.html)
endif
# Arguments;
@@ -79,11 +66,3 @@
define add-testcase-apk
TEST_APKS += $(call intermediates-dir-for,APPS,$(1))/package.apk
endef
-
-# Arguments:
-# 1 - Name of the resources to copy like "api-coverage.css" with no path.
-# 2 - Destination file name of the copied resource
-define copy-coverage-resource
- $(hide) mkdir -p `dirname $(2)`
- $(hide) $(ACP) $(COVERAGE_RES)/$(1) $(2)
-endef