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

nodejs / node Public

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

• Code
• Issues 635
• Pull requests 753
• Actions
• Projects
• Security and quality
• Insights

Additional navigation options

Commit 467ac3a

Browse filesBrowse the repository at this point in the historyBrowse files

joyeecheung

authored and

RafaelGSS

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 8a4f8a9 commit 467ac3a
Copy full SHA for 467ac3a

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

0 commit comments

Comments

0 (0)