@@ -19,24 +19,24 @@ PWD = $(CURDIR)
19
19
BUILD_WITH ?= make
20
20
21
21
ifdef JOBS
22
- PARALLEL_ARGS = -j $(JOBS )
22
+ PARALLEL_ARGS = -j $(JOBS)
23
23
else
24
- PARALLEL_ARGS = -J
24
+ PARALLEL_ARGS = -J
25
25
endif
26
26
27
27
ifdef ENABLE_V8_TAP
28
- TAP_V8 := --junitout $(PWD ) /v8-tap.xml
29
- TAP_V8_INTL := --junitout $(PWD ) /v8-intl-tap.xml
30
- TAP_V8_BENCHMARKS := --junitout $(PWD ) /v8-benchmarks-tap.xml
28
+ TAP_V8 := --junitout $(PWD)/v8-tap.xml
29
+ TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
30
+ TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
31
31
endif
32
32
33
33
V8_TEST_OPTIONS = $(V8_EXTRA_TEST_OPTIONS )
34
34
ifdef DISABLE_V8_I18N
35
- V8_BUILD_OPTIONS += i18nsupport=off
35
+ V8_BUILD_OPTIONS += i18nsupport=off
36
36
endif
37
37
38
38
ifeq ($(OSTYPE ) , darwin)
39
- GCOV = xcrun llvm-cov gcov
39
+ GCOV = xcrun llvm-cov gcov
40
40
endif
41
41
42
42
BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE ) | tr '[A-Z]' '[a-z]')
62
62
# Use -e to double check in case it's a broken link
63
63
# Use $(PWD) so we can cd to anywhere before calling this
64
64
available-node = \
65
- if [ -x $(PWD ) /$(NODE ) ] && [ -e $(PWD ) /$(NODE ) ]; then \
65
+ if [ -x $(PWD ) /$(NODE ) ] && [ -e $(PWD ) /$(NODE ) ]; then \
66
66
$(PWD ) /$(NODE ) $(1 ) ; \
67
67
elif [ -x ` which node ` ] && [ -e ` which node ` ] && [ ` which node ` ]; then \
68
68
` which node ` $(1 ) ; \
@@ -107,12 +107,12 @@ $(NODE_G_EXE): config.gypi out/Makefile
107
107
else
108
108
ifeq ($(BUILD_WITH ) , ninja)
109
109
ifeq ($(V ) ,1)
110
- NINJA_ARGS := $(NINJA_ARGS ) -v
110
+ NINJA_ARGS := $(NINJA_ARGS) -v
111
111
endif
112
112
ifdef JOBS
113
- NINJA_ARGS := $(NINJA_ARGS ) -j$(JOBS )
113
+ NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
114
114
else
115
- NINJA_ARGS := $(NINJA_ARGS ) $(filter -j% ,$(MAKEFLAGS ) )
115
+ NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
116
116
endif
117
117
$(NODE_EXE ) : config.gypi out/Release/build.ninja
118
118
ninja -C out/Release $(NINJA_ARGS )
@@ -141,9 +141,9 @@ test-code-cache: with-code-cache
141
141
echo " 'test-code-cache' target is a noop"
142
142
143
143
out/Makefile : config.gypi common.gypi node.gyp \
144
- deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
145
- tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
146
- tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
144
+ deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
145
+ tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
146
+ tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
147
147
$(PYTHON ) tools/gyp_node.py -f make
148
148
149
149
config.gypi : configure configure.py
@@ -243,7 +243,7 @@ coverage-test: coverage-build
243
243
$(RM ) out/$(BUILDTYPE ) /obj.target/node_lib/src/* .gcda
244
244
$(RM ) out/$(BUILDTYPE ) /obj.target/node_lib/src/tracing/* .gcda
245
245
-NODE_V8_COVERAGE=out/$(BUILDTYPE ) /.coverage \
246
- TEST_CI_ARGS ="$(TEST_CI_ARGS ) --type=coverage" $(MAKE ) $(COVTESTS )
246
+ TEST_CI_ARGS=" $( TEST_CI_ARGS) --type=coverage" $(MAKE ) $(COVTESTS )
247
247
$(MAKE ) coverage-report-js
248
248
-(cd out && " ../gcovr/scripts/gcovr" --gcov-exclude=' .*deps' \
249
249
--gcov-exclude=' .*usr' -v -r Release/obj.target \
@@ -261,7 +261,7 @@ COV_REPORT_OPTIONS = --reporter=html \
261
261
--resolve=./lib --exclude="benchmark/" --exclude="deps/" --exclude="test/" --exclude="tools/" \
262
262
--wrapper-length=0
263
263
ifdef COV_ENFORCE_THRESHOLD
264
- COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD )
264
+ COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD)
265
265
endif
266
266
267
267
.PHONY : coverage-report-js
@@ -299,7 +299,7 @@ coverage-run-js:
299
299
$(RM ) -r out/$(BUILDTYPE ) /.coverage
300
300
$(MAKE ) coverage-build-js
301
301
-NODE_V8_COVERAGE=out/$(BUILDTYPE ) /.coverage CI_SKIP_TESTS=$(COV_SKIP_TESTS ) \
302
- TEST_CI_ARGS=" $( TEST_CI_ARGS) --type=coverage" $(MAKE ) jstest
302
+ TEST_CI_ARGS=" $( TEST_CI_ARGS) --type=coverage" $(MAKE ) jstest
303
303
$(MAKE ) coverage-report-js
304
304
305
305
.PHONY : test
@@ -362,7 +362,7 @@ DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
362
362
endif
363
363
364
364
node_use_openssl = $(call available-node,"-p" \
365
- "process.versions.openssl != undefined")
365
+ "process.versions.openssl != undefined")
366
366
test/addons/.docbuildstamp : $(DOCBUILDSTAMP_PREREQS ) tools/doc/node_modules
367
367
@if [ " $( shell $( node_use_openssl) ) " != " true" ]; then \
368
368
echo " Skipping .docbuildstamp (no crypto)" ; \
@@ -387,9 +387,9 @@ ADDONS_PREREQS := config.gypi \
387
387
388
388
define run_build_addons
389
389
env npm_config_loglevel=$(LOGLEVEL ) npm_config_nodedir="$$PWD" \
390
- npm_config_python="$(PYTHON ) " $(NODE ) "$$PWD/tools/build-addons" \
391
- "$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
392
- $1
390
+ npm_config_python="$(PYTHON ) " $(NODE ) "$$PWD/tools/build-addons" \
391
+ "$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
392
+ $1
393
393
touch $2
394
394
endef
395
395
@@ -489,9 +489,9 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
489
489
CI_NATIVE_SUITES ?= addons js-native-api node-api
490
490
CI_JS_SUITES ?= default
491
491
ifeq ($(node_use_openssl ) , false)
492
- CI_DOC := doctool
492
+ CI_DOC := doctool
493
493
else
494
- CI_DOC =
494
+ CI_DOC =
495
495
endif
496
496
497
497
.PHONY : test-ci-native
@@ -659,21 +659,21 @@ ifneq ("","$(wildcard deps/v8/tools/run-tests.py)")
659
659
# Related CI job: node-test-commit-v8-linux
660
660
test-v8 : v8 # # Runs the V8 test suite on deps/v8.
661
661
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH ) \
662
- --mode =$(BUILDTYPE_LOWER ) $(V8_TEST_OPTIONS ) \
662
+ --mode=$(BUILDTYPE_LOWER ) $(V8_TEST_OPTIONS ) \
663
663
mjsunit cctest debugger inspector message preparser \
664
- $(TAP_V8 )
664
+ $(TAP_V8 )
665
665
@echo Testing hash seed
666
666
$(MAKE ) test-hash-seed
667
667
668
668
test-v8-intl : v8
669
669
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH ) \
670
- --mode =$(BUILDTYPE_LOWER ) intl \
671
- $(TAP_V8_INTL )
670
+ --mode=$(BUILDTYPE_LOWER ) intl \
671
+ $(TAP_V8_INTL )
672
672
673
673
test-v8-benchmarks : v8
674
674
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH ) --mode=$(BUILDTYPE_LOWER ) \
675
- benchmarks \
676
- $(TAP_V8_BENCHMARKS)
675
+ benchmarks \
676
+ $(TAP_V8_BENCHMARKS )
677
677
678
678
test-v8-updates :
679
679
$(PYTHON ) tools/test.py $(PARALLEL_ARGS ) --mode=$(BUILDTYPE_LOWER ) v8-updates
@@ -1185,8 +1185,8 @@ tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
1185
1185
LINT_MD_TARGETS = src lib benchmark test tools/doc tools/icu
1186
1186
LINT_MD_ROOT_DOCS := $(wildcard * .md)
1187
1187
LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS ) -type f \
1188
- ! -path '* node_modules* ' ! -path 'test/fixtures/* ' -name '* .md') \
1189
- $(LINT_MD_ROOT_DOCS )
1188
+ ! -path '* node_modules* ' ! -path 'test/fixtures/* ' -name '* .md') \
1189
+ $(LINT_MD_ROOT_DOCS )
1190
1190
run-lint-misc-md = tools/lint-md.js -q -f $(LINT_MD_MISC_FILES )
1191
1191
# Lint other changed markdown files maintained by us
1192
1192
tools/.miscmdlintstamp : $(LINT_MD_MISC_FILES )
@@ -1302,9 +1302,9 @@ else
1302
1302
endif
1303
1303
1304
1304
ifeq ($(V ) ,1)
1305
- CPPLINT_QUIET =
1305
+ CPPLINT_QUIET =
1306
1306
else
1307
- CPPLINT_QUIET = --quiet
1307
+ CPPLINT_QUIET = --quiet
1308
1308
endif
1309
1309
.PHONY : lint-cpp
1310
1310
# Lints the C++ code with cpplint.py and check-imports.py.
0 commit comments