Skip to content

Commit f622771

Browse files
addaleaxBridgeAR
authored andcommitted
build: improve make coverage
Run cleanup for all relevant subdirectories, and exclude generated source files (e.g. `out/Release/...`) from coverage reporting. Also enable running `make cctest` again (It’s unclear to me why this was disabled, as it does reduce coverage unnecessarily). PR-URL: #29487 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Benjamin Gruenbaum <[email protected]> Reviewed-By: Jiawen Geng <[email protected]>
1 parent a262e2f commit f622771

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Makefile

+5-7
Original file line numberDiff line numberDiff line change
@@ -240,17 +240,15 @@ coverage-build-js:
240240

241241
.PHONY: coverage-test
242242
coverage-test: coverage-build
243-
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
244243
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
245-
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
246-
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/gen/*.gcda
244+
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*/*.gcda
247245
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
248-
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
246+
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*/*.gcda
249247
-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage \
250248
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
251249
$(MAKE) coverage-report-js
252-
-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
253-
--gcov-exclude='.*usr' -v -r Release/obj.target \
250+
-(cd out && "../gcovr/scripts/gcovr" \
251+
--gcov-exclude='.*\b(deps|usr|out|cctest)\b' -v -r Release/obj.target \
254252
--html --html-detail -o ../coverage/cxxcoverage.html \
255253
--gcov-executable="$(GCOV)")
256254
@echo -n "Javascript coverage %: "
@@ -335,7 +333,7 @@ test-cov: all
335333
$(MAKE) build-addons
336334
$(MAKE) build-js-native-api-tests
337335
$(MAKE) build-node-api-tests
338-
# $(MAKE) cctest
336+
$(MAKE) cctest
339337
CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest
340338

341339
test-parallel: all

0 commit comments

Comments
 (0)