Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 44d80c5

Browse filesBrowse files
killaguaddaleax
authored andcommitted
build: fix coverage after gcovr update
PR-URL: #18958 Fixes: #18938 Ref: nodejs/build#1145 Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
1 parent 4d5cd5c commit 44d80c5
Copy full SHA for 44d80c5

File tree

Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed
Open diff view settings
Filter options
Expand file treeCollapse file tree

1 file changed

+3
-3
lines changed
Open diff view settings
Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile
+3-3Lines changed: 3 additions & 3 deletions
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 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.