@@ -204,7 +204,7 @@ check: test
204
204
# in place
205
205
coverage-clean :
206
206
$(RM ) -r node_modules
207
- $(RM ) -r gcovr build
207
+ $(RM ) -r gcovr
208
208
$(RM ) -r coverage/tmp
209
209
$(FIND ) out/$(BUILDTYPE ) /obj.target \( -name " *.gcda" -o -name " *.gcno" \) \
210
210
-type f -exec $(RM ) {} \;
@@ -220,13 +220,7 @@ coverage: coverage-test ## Run the tests and generate a coverage report.
220
220
.PHONY : coverage-build
221
221
coverage-build : all
222
222
-$(MAKE ) coverage-build-js
223
- if [ ! -d gcovr ]; then git clone -b 3.4 --depth=1 \
224
- --single-branch https://github.com/gcovr/gcovr.git; fi
225
- if [ ! -d build ]; then git clone --depth=1 \
226
- --single-branch https://github.com/nodejs/build.git; fi
227
- if [ ! -f gcovr/scripts/gcovr.orig ]; then \
228
- (cd gcovr && patch -N -p1 < \
229
- " $( CURDIR) /build/jenkins/scripts/coverage/gcovr-patches-3.4.diff" ); fi
223
+ if [ ! -d gcovr ]; then $( PYTHON) -m pip install -t gcovr gcovr==4.2; fi
230
224
$(MAKE )
231
225
232
226
.PHONY : coverage-build-js
@@ -238,16 +232,14 @@ coverage-build-js:
238
232
239
233
.PHONY : coverage-test
240
234
coverage-test : coverage-build
241
- $(RM ) out/$(BUILDTYPE ) /obj.target/node/src/* .gcda
242
- $(RM ) out/$(BUILDTYPE ) /obj.target/node/src/* /* .gcda
243
- $(RM ) out/$(BUILDTYPE ) /obj.target/node_lib/src/* .gcda
244
- $(RM ) out/$(BUILDTYPE ) /obj.target/node_lib/src/* /* .gcda
235
+ $(FIND ) out/$(BUILDTYPE ) /obj.target -name " *.gcda" -type f -exec $(RM ) {} \;
245
236
-NODE_V8_COVERAGE=coverage/tmp \
246
237
TEST_CI_ARGS=" $( TEST_CI_ARGS) --type=coverage" $(MAKE ) $(COVTESTS )
247
238
$(MAKE ) coverage-report-js
248
- -(cd out && " ../gcovr/scripts/ gcovr" \
239
+ -(cd out && PYTHONPATH= ../gcovr $( PYTHON ) -m gcovr \
249
240
--gcov-exclude=' .*\b(deps|usr|out|cctest|embedding)\b' -v \
250
- -r Release/obj.target --html --html-detail -o ../coverage/cxxcoverage.html \
241
+ -r ../src/ --object-directory Release/obj.target \
242
+ --html --html-details -o ../coverage/cxxcoverage.html \
251
243
--gcov-executable=" $( GCOV) " )
252
244
@printf " Javascript coverage %%: "
253
245
@grep -B1 Lines coverage/index.html | head -n1 \
0 commit comments