Skip to content

Commit 44d80c5

Browse files
killaguaddaleax
authored andcommitted
build: fix coverage after gcovr update
PR-URL: #18958 Fixes: #18938 Ref: nodejs/build#1145 Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Daijiro Wachi <[email protected]>
1 parent 4d5cd5c commit 44d80c5

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Makefile

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,8 +176,8 @@ coverage-build: all
176176
--single-branch git://github.com/gcovr/gcovr.git; fi
177177
if [ ! -d build ]; then git clone --depth=1 \
178178
--single-branch https://github.com/nodejs/build.git; fi
179-
if [ ! -f gcovr/scripts/gcovr.orig ]; then \
180-
(cd gcovr && patch -N -p1 < \
179+
if [ ! -f gcovr/gcovr/gcov.py.orig ]; then \
180+
(cd gcovr && patch -b -N -p1 < \
181181
"$(CURDIR)/build/jenkins/scripts/coverage/gcovr-patches.diff"); fi
182182
if [ -d lib_ ]; then $(RM) -r lib; mv lib_ lib; fi
183183
mv lib lib_
@@ -203,7 +203,7 @@ coverage-test: coverage-build
203203
(cd lib && .$(NODE) ../node_modules/.bin/nyc report \
204204
--temp-directory "$(CURDIR)/.cov_tmp" \
205205
--report-dir "../coverage")
206-
-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
206+
-(cd out && PYTHONPATH=$(CURDIR)/gcovr $(PYTHON) -m gcovr --gcov-exclude='.*deps' \
207207
--gcov-exclude='.*usr' -v -r Release/obj.target \
208208
--html --html-detail -o ../coverage/cxxcoverage.html \
209209
--gcov-executable="$(GCOV)")

0 commit comments

Comments
 (0)