build: don't clean obj.target directory if it doesn't exist · nodejs/node@82d8051 · GitHub

nodejs / node Public

• Notifications You must be signed in to change notification settings
• Fork 36.6k
• Star 120k

• Code
• Issues 634
• Pull requests 749
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 82d8051

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

targos

committed

build: don't clean obj.target directory if it doesn't exist

This can happen to ninja builds, which would then throw an error instead of being a noop if the command is executed. PR-URL: #54337 Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com> Reviewed-By: Luigi Pinca <luigipinca@gmail.com> Reviewed-By: Chengzhong Wu <legendecas@gmail.com>

1 parent 36931aa commit 82d8051
Copy full SHA for 82d8051

1 file changed

+7-3Lines changed: 7 additions & 3 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Makefile

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Makefile‎

Copy file name to clipboardExpand all lines: Makefile

+7-3Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -240,8 +240,10 @@ coverage-clean:
240	240	$(RM) -r node_modules
241	241	$(RM) -r gcovr
242	242	$(RM) -r coverage/tmp
243		- $(FIND) out/$(BUILDTYPE)/obj.target \( -name "*.gcda" -o -name "*.gcno" \) \
244		- -type f -exec $(RM) {} \;
	243	+ @if [ -d "out/Release/obj.target" ]; then \
	244	+ $(FIND) out/$(BUILDTYPE)/obj.target \( -name "*.gcda" -o -name "*.gcno" \) \
	245	+ -type f -exec $(RM) {};\
	246	+ fi
245	247
246	248	.PHONY: coverage
247	249	# Build and test with code coverage reporting. HTML coverage reports will be
@@ -265,7 +267,9 @@ coverage-build-js:
265	267
266	268	.PHONY: coverage-test
267	269	coverage-test: coverage-build
268		- $(FIND) out/$(BUILDTYPE)/obj.target -name "*.gcda" -type f -exec $(RM) {} \;
	270	+ @if [ -d "out/Release/obj.target" ]; then \
	271	+ $(FIND) out/$(BUILDTYPE)/obj.target -name "*.gcda" -type f -exec $(RM) {}; \
	272	+ fi
269	273	-NODE_V8_COVERAGE=coverage/tmp \
270	274	TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
271	275	$(MAKE) coverage-report-js

0 commit comments

Comments

0 (0)