diff options
| author | Anna Henningsen <anna@addaleax.net> | 2019-09-07 22:20:17 +0200 |
|---|---|---|
| committer | Rich Trott <rtrott@gmail.com> | 2019-09-10 01:49:17 -0700 |
| commit | f2e35ff691298537beb72c10a2d39be8e77cc2fd (patch) | |
| tree | 62097935b3b785abbc3785140cc9bb260d800482 /Makefile | |
| parent | f6152857f94e9fbae1f3780f619434d44b60d0bc (diff) | |
| download | android-node-v8-f2e35ff691298537beb72c10a2d39be8e77cc2fd.tar.gz android-node-v8-f2e35ff691298537beb72c10a2d39be8e77cc2fd.tar.bz2 android-node-v8-f2e35ff691298537beb72c10a2d39be8e77cc2fd.zip | |
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: https://github.com/nodejs/node/pull/29487
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
@@ -240,17 +240,15 @@ coverage-build-js: .PHONY: coverage-test coverage-test: coverage-build - $(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda $(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda - $(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda - $(RM) out/$(BUILDTYPE)/obj.target/node_lib/gen/*.gcda + $(RM) out/$(BUILDTYPE)/obj.target/node/src/*/*.gcda $(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda - $(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda + $(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*/*.gcda -NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage \ TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS) $(MAKE) coverage-report-js - -(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \ - --gcov-exclude='.*usr' -v -r Release/obj.target \ + -(cd out && "../gcovr/scripts/gcovr" \ + --gcov-exclude='.*\b(deps|usr|out|cctest)\b' -v -r Release/obj.target \ --html --html-detail -o ../coverage/cxxcoverage.html \ --gcov-executable="$(GCOV)") @echo -n "Javascript coverage %: " @@ -335,7 +333,7 @@ test-cov: all $(MAKE) build-addons $(MAKE) build-js-native-api-tests $(MAKE) build-node-api-tests - # $(MAKE) cctest + $(MAKE) cctest CI_SKIP_TESTS=$(COV_SKIP_TESTS) $(MAKE) jstest test-parallel: all |