Skip to content

Commit 4012ae8

Browse files
yhwangaddaleax
authored andcommitted
build: fix coverage build
After adding the node_lib target in node.gyp, most of the node source files are moved to that target. When coverage option is enabled, corresponding cflags and ldflags are needed in that target as well. gcovr also needs to check .gcda data for both node and node_lib. PR-URL: #18409 Fixes: #18402 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Joyee Cheung <[email protected]> Reviewed-By: Michael Dawson <[email protected]>
1 parent dd917eb commit 4012ae8

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@ coverage-test: coverage-build
191191
$(RM) out/$(BUILDTYPE)/obj.target/node/gen/*.gcda
192192
$(RM) out/$(BUILDTYPE)/obj.target/node/src/*.gcda
193193
$(RM) out/$(BUILDTYPE)/obj.target/node/src/tracing/*.gcda
194+
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/gen/*.gcda
195+
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
196+
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
194197
-$(MAKE) $(COVTESTS)
195198
mv lib lib__
196199
mv lib_ lib
@@ -201,7 +204,7 @@ coverage-test: coverage-build
201204
--temp-directory "$(CURDIR)/.cov_tmp" \
202205
--report-dir "../coverage")
203206
-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
204-
--gcov-exclude='.*usr' -v -r Release/obj.target/node \
207+
--gcov-exclude='.*usr' -v -r Release/obj.target \
205208
--html --html-detail -o ../coverage/cxxcoverage.html \
206209
--gcov-executable="$(GCOV)")
207210
mv lib lib_

node.gypi

+6-11
Original file line numberDiff line numberDiff line change
@@ -236,25 +236,20 @@
236236
],
237237
}],
238238
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
239-
' and coverage=="false" and force_load=="true"', {
239+
' and force_load=="true"', {
240240
'ldflags': [ '-Wl,-z,noexecstack',
241241
'-Wl,--whole-archive <(v8_base)',
242242
'-Wl,--no-whole-archive' ]
243243
}],
244-
[ '(OS=="freebsd" or OS=="linux") and node_shared=="false"'
245-
' and coverage=="true" and force_load=="true"', {
246-
'ldflags': [ '-Wl,-z,noexecstack',
247-
'-Wl,--whole-archive <(v8_base)',
248-
'-Wl,--no-whole-archive',
249-
'--coverage',
244+
[ 'OS in "mac freebsd linux" and node_shared=="false"'
245+
' and coverage=="true"', {
246+
'ldflags': [ '--coverage',
250247
'-g',
251248
'-O0' ],
252-
'cflags': [ '--coverage',
249+
'cflags': [ '--coverage',
253250
'-g',
254251
'-O0' ],
255-
'cflags!': [ '-O3' ]
256-
}],
257-
[ 'OS=="mac" and node_shared=="false" and coverage=="true"', {
252+
'cflags!': [ '-O3' ],
258253
'xcode_settings': {
259254
'OTHER_LDFLAGS': [
260255
'--coverage',

0 commit comments

Comments
 (0)