Skip to content

Commit 4b53d09

Browse files
committed
build: fix inconsistent quoting in Makefile
1 parent fbef1cf commit 4b53d09

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

Makefile

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ endif
1717
ARCHTYPE := $(shell uname -m | tr '[:upper:]' '[:lower:]')
1818
COVTESTS ?= test-cov
1919
COV_SKIP_TESTS ?= core_line_numbers.js,testFinalizer.js,test_function/test.js
20-
GTEST_FILTER ?= "*"
20+
GTEST_FILTER ?= *
2121
GNUMAKEFLAGS += --no-print-directory
2222
GCOV ?= gcov
2323
PWD = $(CURDIR)
@@ -31,9 +31,9 @@ else
3131
endif
3232

3333
ifdef ENABLE_V8_TAP
34-
TAP_V8 := --junitout $(PWD)/v8-tap.xml
35-
TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
36-
TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
34+
TAP_V8 := --junitout '$(PWD)/v8-tap.xml'
35+
TAP_V8_INTL := --junitout '$(PWD)/v8-intl-tap.xml'
36+
TAP_V8_BENCHMARKS := --junitout '$(PWD)/v8-benchmarks-tap.xml'
3737
define convert_to_junit
3838
@true
3939
endef
@@ -47,12 +47,12 @@ ifdef ENABLE_CONVERT_V8_JSON_TO_XML
4747
# By default, the V8's JSON test output only includes the tests which have
4848
# failed. We use --slow-tests-cutoff to ensure that all tests are present
4949
# in the output, including those which pass.
50-
TAP_V8 := --json-test-results $(TAP_V8_JSON) --slow-tests-cutoff 1000000
51-
TAP_V8_INTL := --json-test-results $(TAP_V8_INTL_JSON) --slow-tests-cutoff 1000000
52-
TAP_V8_BENCHMARKS := --json-test-results $(TAP_V8_BENCHMARKS_JSON) --slow-tests-cutoff 1000000
50+
TAP_V8 := --json-test-results '$(TAP_V8_JSON)' --slow-tests-cutoff 1000000
51+
TAP_V8_INTL := --json-test-results '$(TAP_V8_INTL_JSON)' --slow-tests-cutoff 1000000
52+
TAP_V8_BENCHMARKS := --json-test-results '$(TAP_V8_BENCHMARKS_JSON)' --slow-tests-cutoff 1000000
5353

5454
define convert_to_junit
55-
export PATH="$(NO_BIN_OVERRIDE_PATH)" && \
55+
PATH="$(NO_BIN_OVERRIDE_PATH)" \
5656
$(PYTHON) tools/v8-json-to-junit.py < $(1) > $(1:.json=.xml)
5757
endef
5858
endif
@@ -79,7 +79,7 @@ EXEEXT := $(shell $(PYTHON) -c \
7979

8080
NODE_EXE = node$(EXEEXT)
8181
# Use $(PWD) so we can cd to anywhere before calling this
82-
NODE ?= "$(PWD)/$(NODE_EXE)"
82+
NODE ?= $(PWD)/$(NODE_EXE)
8383
NODE_G_EXE = node_g$(EXEEXT)
8484
NPM ?= ./deps/npm/bin/npm-cli.js
8585

@@ -94,8 +94,8 @@ V ?= 0
9494

9595
# Use -e to double check in case it's a broken link
9696
available-node = \
97-
if [ -x "$(NODE)" ] && [ -e "$(NODE)" ]; then \
98-
"$(NODE)" $(1); \
97+
if [ -x '$(NODE)' ] && [ -e '$(NODE)' ]; then \
98+
'$(NODE)' $(1); \
9999
elif [ -x `command -v node` ] && [ -e `command -v node` ] && [ `command -v node` ]; then \
100100
`command -v node` $(1); \
101101
else \
@@ -260,7 +260,7 @@ coverage-build: all ## Build coverage files.
260260
coverage-build-js: ## Build JavaScript coverage files.
261261
mkdir -p node_modules
262262
if [ ! -d node_modules/c8 ]; then \
263-
$(NODE) ./deps/npm install c8 --no-save --no-package-lock;\
263+
'$(NODE)' ./deps/npm install c8 --no-save --no-package-lock;\
264264
fi
265265

266266
.PHONY: coverage-test
@@ -287,13 +287,13 @@ coverage-test: coverage-build ## Run the tests and generate a coverage report.
287287
.PHONY: coverage-report-js
288288
coverage-report-js: ## Report JavaScript coverage results.
289289
-$(MAKE) coverage-build-js
290-
$(NODE) ./node_modules/.bin/c8 report
290+
'$(NODE)' ./node_modules/.bin/c8 report
291291

292292
.PHONY: cctest
293293

294294
cctest: all ## Run the C++ tests using the built `cctest` executable.
295-
@out/$(BUILDTYPE)/$@ --gtest_filter=$(GTEST_FILTER)
296-
$(NODE) ./test/embedding/test-embedding.js
295+
@out/$(BUILDTYPE)/$@ --gtest_filter="$(GTEST_FILTER)"
296+
'$(NODE)' ./test/embedding/test-embedding.js
297297

298298
.PHONY: list-gtests
299299
list-gtests: ## List all available C++ gtests.
@@ -385,7 +385,7 @@ test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules
385385
echo "Skipping .docbuildstamp (no crypto and/or no ICU)"; \
386386
else \
387387
$(RM) -r test/addons/??_*/; \
388-
[ -x $(NODE) ] && $(NODE) $< || node $< ; \
388+
[ -x '$(NODE)' ] && '$(NODE)' $< || node $< ; \
389389
[ $$? -eq 0 ] && touch $@; \
390390
fi
391391

@@ -605,7 +605,7 @@ test-ci: | clear-stalled bench-addons-build build-addons build-js-native-api-tes
605605
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
606606
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
607607
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
608-
$(NODE) ./test/embedding/test-embedding.js
608+
'$(NODE)' ./test/embedding/test-embedding.js
609609
$(info Clean up any leftover processes, error if found.)
610610
ps awwx | grep Release/node | grep -v grep | cat
611611
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
@@ -651,8 +651,8 @@ test-wpt: all ## Run the Web Platform Tests.
651651
test-wpt-report: ## Run the Web Platform Tests and generate a report.
652652
$(RM) -r out/wpt
653653
mkdir -p out/wpt
654-
-WPT_REPORT=1 $(PYTHON) tools/test.py --shell $(NODE) $(PARALLEL_ARGS) wpt
655-
$(NODE) "$$PWD/tools/merge-wpt-reports.mjs"
654+
-WPT_REPORT=1 $(PYTHON) tools/test.py --shell '$(NODE)' $(PARALLEL_ARGS) wpt
655+
'$(NODE)' "$$PWD/tools/merge-wpt-reports.mjs"
656656

657657
.PHONY: test-internet
658658
test-internet: all ## Run internet tests.
@@ -672,7 +672,7 @@ test-doc: doc-only lint-md ## Build, lint, and verify the docs.
672672

673673
.PHONY: test-doc-ci
674674
test-doc-ci: doc-only ## Build, lint, and verify the docs (CI).
675-
$(PYTHON) tools/test.py --shell $(NODE) $(TEST_CI_ARGS) $(PARALLEL_ARGS) doctool
675+
$(PYTHON) tools/test.py --shell '$(NODE)' $(TEST_CI_ARGS) $(PARALLEL_ARGS) doctool
676676

677677
.PHONY: test-known-issues
678678
test-known-issues: all ## Run tests for known issues.
@@ -681,11 +681,11 @@ test-known-issues: all ## Run tests for known issues.
681681
# Related CI job: node-test-npm
682682
.PHONY: test-npm
683683
test-npm: $(NODE_EXE) ## Run the npm test suite on deps/npm.
684-
$(NODE) tools/test-npm-package --install --logfile=test-npm.tap deps/npm test
684+
'$(NODE)' tools/test-npm-package --install --logfile=test-npm.tap deps/npm test
685685

686686
.PHONY: test-npm-publish
687687
test-npm-publish: $(NODE_EXE) ## Test the `npm publish` command.
688-
npm_package_config_publishtest=true $(NODE) deps/npm/test/run.js
688+
npm_package_config_publishtest=true '$(NODE)' deps/npm/test/run.js
689689

690690
.PHONY: test-js-native-api
691691
test-js-native-api: test-build-js-native-api ## Run JS Native-API tests.
@@ -829,7 +829,7 @@ out/doc/api/assets/%: doc/api_assets/% | out/doc/api/assets
829829
@cp $< $@ ; $(RM) out/doc/api/assets/README.md
830830

831831

832-
run-npm-ci = $(PWD)/$(NPM) ci
832+
run-npm-ci = '$(PWD)/$(NPM)' ci
833833

834834
LINK_DATA = out/doc/apilinks.json
835835
VERSIONS_DATA = out/previous-doc-versions.json
@@ -1169,7 +1169,7 @@ endif
11691169
$(MACOSOUTDIR)/dist/npm/usr/local/lib/node_modules
11701170
unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npm
11711171
unlink $(MACOSOUTDIR)/dist/node/usr/local/bin/npx
1172-
$(NODE) tools/license2rtf.mjs < LICENSE > \
1172+
'$(NODE)' tools/license2rtf.mjs < LICENSE > \
11731173
$(MACOSOUTDIR)/installer/productbuild/Resources/license.rtf
11741174
cp doc/osx_installer_logo.png $(MACOSOUTDIR)/installer/productbuild/Resources
11751175
pkgbuild --version $(FULLVERSION) \
@@ -1667,8 +1667,8 @@ HAS_DOCKER ?= $(shell command -v docker > /dev/null 2>&1; [ $$? -eq 0 ] && echo
16671667

16681668
.PHONY: gen-openssl
16691669
ifeq ($(HAS_DOCKER), 1)
1670-
DOCKER_COMMAND ?= docker run --rm -u $(shell id -u) -v $(PWD):/node
1671-
IS_IN_WORKTREE = $(shell grep '^gitdir: ' $(PWD)/.git 2>/dev/null)
1670+
DOCKER_COMMAND ?= docker run --rm -u $(shell id -u) -v '$(PWD):/node'
1671+
IS_IN_WORKTREE = $(shell grep '^gitdir: ' '$(PWD)/.git' 2>/dev/null)
16721672
GIT_WORKTREE_COMMON = $(shell git rev-parse --git-common-dir)
16731673
DOCKER_COMMAND += $(if $(IS_IN_WORKTREE), -v $(GIT_WORKTREE_COMMON):$(GIT_WORKTREE_COMMON))
16741674
gen-openssl: ## Generate platform dependent openssl files (requires docker).

0 commit comments

Comments
 (0)