Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bad8b386 authored Jun 09, 2020 by Roland Levillain

Rename native code coverage paths product variables in Make.

Rename `CoveragePath` and `CoverageExcludePaths` as
`NativeCoveragePath` and `NativeCoverageExcludePaths` (resp.).
Also, populate `NativeCoveragePath` and `NativeCoverageExcludePaths`
from environment variables `NATIVE_COVERAGE_PATHS` and
`NATIVE_COVERAGE_EXCLUDE_PATHS` (resp.).

Test: m nothing
Bug: 158212027
Change-Id: I409dbb04b09744a7bd95a4b69361e858b9f89e23

parent 1d1bb3b9

core/binary.mk

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -71,8 +71,12 @@ ifeq (,$(strip $(my_cc))$(strip $(my_cxx)))
	my_pool := $(GOMA_OR_RBE_POOL)		my_pool := $(GOMA_OR_RBE_POOL)
	endif		endif

	ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))		# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this condition when all users have been moved
	ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))		# to `NATIVE_COVERAGE_PATHS`.
			ifneq (,$(strip $(foreach dir,$(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
			# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this condition when all users have been
			# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.
			ifeq (,$(strip $(foreach dir,$(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS),$(filter $(dir)%,$(LOCAL_PATH)))))
	my_native_coverage := true		my_native_coverage := true
	else		else
	my_native_coverage := false		my_native_coverage := false

core/line_coverage.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@
	#		#
	# To run the make target set the coverage related envvars first:		# To run the make target set the coverage related envvars first:
	# NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true \		# NATIVE_LINE_COVERAGE=true NATIVE_COVERAGE=true \
	# COVERAGE_PATHS=* make haiku-line-coverage		# NATIVE_COVERAGE_PATHS=* make haiku-line-coverage
	# -----------------------------------------------------------------		# -----------------------------------------------------------------

	# TODO(b/148306195): Due this issue some fuzz targets cannot be built with		# TODO(b/148306195): Due this issue some fuzz targets cannot be built with

core/soong_config.mk

+6 −2

Original line number	Original line	Diff line number	Diff line
	@@ -113,8 +113,12 @@ $(call add_json_str, TidyChecks, $(WITH_TIDY_CHECKS))
	$(call add_json_bool, NativeLineCoverage, $(filter true,$(NATIVE_LINE_COVERAGE)))		$(call add_json_bool, NativeLineCoverage, $(filter true,$(NATIVE_LINE_COVERAGE)))
	$(call add_json_bool, Native_coverage, $(filter true,$(NATIVE_COVERAGE)))		$(call add_json_bool, Native_coverage, $(filter true,$(NATIVE_COVERAGE)))
	$(call add_json_bool, ClangCoverage, $(filter true,$(CLANG_COVERAGE)))		$(call add_json_bool, ClangCoverage, $(filter true,$(CLANG_COVERAGE)))
	$(call add_json_list, CoveragePaths, $(COVERAGE_PATHS))		# TODO(b/158212027): Remove `$(COVERAGE_PATHS)` from this list when all users have been moved to
	$(call add_json_list, CoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS))		# `NATIVE_COVERAGE_PATHS`.
			$(call add_json_list, NativeCoveragePaths, $(COVERAGE_PATHS) $(NATIVE_COVERAGE_PATHS))
			# TODO(b/158212027): Remove `$(COVERAGE_EXCLUDE_PATHS)` from this list when all users have been
			# moved to `NATIVE_COVERAGE_EXCLUDE_PATHS`.
			$(call add_json_list, NativeCoverageExcludePaths, $(COVERAGE_EXCLUDE_PATHS) $(NATIVE_COVERAGE_EXCLUDE_PATHS))

	$(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO)))		$(call add_json_bool, SamplingPGO, $(filter true,$(SAMPLING_PGO)))