Skip to content

Commit 8656fa9

Browse files
kgrytekgryte
committed
Add support for specifying node flags
1 parent e653c9e commit 8656fa9

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

‎tools/make/lib/benchmark/javascript.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ benchmark-javascript: $(NODE_MODULES)
4141
echo "Running benchmark: $$file"; \
4242
NODE_ENV="$(NODE_ENV_BENCHMARK)" \
4343
NODE_PATH="$(NODE_PATH_BENCHMARK)" \
44-
$(NODE) $$file || exit 1; \
44+
$(NODE) $(NODE_FLAGS_BENCHMARK) $$file || exit 1; \
4545
done
4646

4747
.PHONY: benchmark-javascript
@@ -66,7 +66,7 @@ benchmark-javascript-files: $(NODE_MODULES)
6666
echo "Running benchmark: $$file"; \
6767
NODE_ENV="$(NODE_ENV_BENCHMARK)" \
6868
NODE_PATH="$(NODE_PATH_BENCHMARK)" \
69-
$(NODE) $$file || exit 1; \
69+
$(NODE) $(NODE_FLAGS_BENCHMARK) $$file || exit 1; \
7070
done
7171

7272
.PHONY: benchmark-javascript-files

‎tools/make/lib/examples/javascript.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ examples-javascript: $(NODE_MODULES)
4141
echo "Running example: $$file"; \
4242
NODE_ENV="$(NODE_ENV_EXAMPLES)" \
4343
NODE_PATH="$(NODE_PATH_EXAMPLES)" \
44-
$(NODE) $$file || exit 1; \
44+
$(NODE) $(NODE_FLAGS_EXAMPLES) $$file || exit 1; \
4545
done
4646

4747
.PHONY: examples-javascript
@@ -66,7 +66,7 @@ examples-javascript-files: $(NODE_MODULES)
6666
echo "Running example: $$file"; \
6767
NODE_ENV="$(NODE_ENV_EXAMPLES)" \
6868
NODE_PATH="$(NODE_PATH_EXAMPLES)" \
69-
$(NODE) $$file || exit 1; \
69+
$(NODE) $(NODE_FLAGS_EXAMPLES) $$file || exit 1; \
7070
done
7171

7272
.PHONY: examples-javascript-files

‎tools/make/lib/repl/node.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,6 @@ repl-node: $(NODE_MODULES) $(STDLIB)
4141
$(QUIET) cd $(REPL_DIR); \
4242
NODE_ENV="$(NODE_ENV_REPL)" \
4343
NODE_PATH="$(NODE_PATH_REPL)" \
44-
$(NODE) $(STDLIB) $(REPL) -- $(REPL_FLAGS)
44+
$(NODE) $(NODE_FLAGS_REPL) $(STDLIB) $(REPL) -- $(REPL_FLAGS)
4545

4646
.PHONY: repl-node

‎tools/make/lib/test/javascript.mk‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ test-javascript-local: $(NODE_MODULES)
6363
echo "Running test: $$test"; \
6464
NODE_ENV="$(NODE_ENV_TEST)" \
6565
NODE_PATH="$(NODE_PATH_TEST)" \
66-
$(JAVASCRIPT_TEST) \
66+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
6767
$(JAVASCRIPT_TEST_FLAGS) \
6868
$$test \
6969
| $(TAP_REPORTER) || exit 1; \
@@ -82,7 +82,7 @@ test-javascript-files-local: $(NODE_MODULES)
8282
echo "Running test: $$test"; \
8383
NODE_ENV="$(NODE_ENV_TEST)" \
8484
NODE_PATH="$(NODE_PATH_TEST)" \
85-
$(JAVASCRIPT_TEST) \
85+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
8686
$(JAVASCRIPT_TEST_FLAGS) \
8787
$$test \
8888
| $(TAP_REPORTER) || exit 1; \
@@ -101,7 +101,7 @@ test-javascript-summary: $(NODE_MODULES)
101101
echo "Running test: $$test"; \
102102
NODE_ENV="$(NODE_ENV_TEST)" \
103103
NODE_PATH="$(NODE_PATH_TEST)" \
104-
$(JAVASCRIPT_TEST) \
104+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
105105
$(JAVASCRIPT_TEST_FLAGS) \
106106
$$test \
107107
| $(TAP_SUMMARY) || exit 1; \
@@ -120,7 +120,7 @@ test-javascript-files-summary: $(NODE_MODULES)
120120
echo "Running test: $$test"; \
121121
NODE_ENV="$(NODE_ENV_TEST)" \
122122
NODE_PATH="$(NODE_PATH_TEST)" \
123-
$(JAVASCRIPT_TEST) \
123+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
124124
$(JAVASCRIPT_TEST_FLAGS) \
125125
$$test \
126126
| $(TAP_SUMMARY) || exit 1; \
@@ -137,7 +137,7 @@ test-javascript-tap: $(NODE_MODULES)
137137
$(QUIET) $(FIND_TESTS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r test; do \
138138
NODE_ENV="$(NODE_ENV_TEST)" \
139139
NODE_PATH="$(NODE_PATH_TEST)" \
140-
$(JAVASCRIPT_TEST) \
140+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
141141
$(JAVASCRIPT_TEST_FLAGS) \
142142
$$test; \
143143
done
@@ -153,7 +153,7 @@ test-javascript-files-tap: $(NODE_MODULES)
153153
$(QUIET) for test in $(FILES); do \
154154
NODE_ENV="$(NODE_ENV_TEST)" \
155155
NODE_PATH="$(NODE_PATH_TEST)" \
156-
$(JAVASCRIPT_TEST) \
156+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
157157
$(JAVASCRIPT_TEST_FLAGS) \
158158
$$test; \
159159
done
@@ -169,7 +169,7 @@ test-javascript-xunit: $(NODE_MODULES)
169169
$(QUIET) $(FIND_TESTS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r test; do \
170170
NODE_ENV="$(NODE_ENV_TEST)" \
171171
NODE_PATH="$(NODE_PATH_TEST)" \
172-
$(JAVASCRIPT_TEST) \
172+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
173173
$(JAVASCRIPT_TEST_FLAGS) \
174174
$$test \
175175
| $(TAP_XUNIT) || exit 1; \
@@ -186,7 +186,7 @@ test-javascript-files-xunit: $(NODE_MODULES)
186186
$(QUIET) for test in $(FILES); do \
187187
NODE_ENV="$(NODE_ENV_TEST)" \
188188
NODE_PATH="$(NODE_PATH_TEST)" \
189-
$(JAVASCRIPT_TEST) \
189+
$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
190190
$(JAVASCRIPT_TEST_FLAGS) \
191191
$$test \
192192
| $(TAP_XUNIT) || exit 1; \

‎tools/make/lib/tools-test-cov/javascript.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ endif
3131

3232
tools-test-javascript-cov:
3333
ifeq ($(JAVASCRIPT_CODE_INSTRUMENTER), istanbul)
34-
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" $(MAKE) -f $(this_file) tools-test-istanbul
34+
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" NODE_FLAGS_TEST="$(NODE_FLAGS_TEST)" $(MAKE) -f $(this_file) tools-test-istanbul
3535
endif
3636

3737
.PHONY: tools-test-javascript-cov

‎tools/make/lib/tools-test/javascript.mk‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
# This target runs JavaScript unit tests using a specified test runner and pipes TAP output to a reporter.
2424

2525
tools-test-javascript:
26-
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files
26+
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" NODE_FLAGS_TEST="$(NODE_FLAGS_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files
2727

2828
.PHONY: tools-test-javascript
2929

@@ -33,7 +33,7 @@ tools-test-javascript:
3333
# This target runs JavaScript unit tests and aggregates TAP output as a test summary.
3434

3535
tools-test-javascript-summary:
36-
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files-summary
36+
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" NODE_FLAGS_TEST="$(NODE_FLAGS_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files-summary
3737

3838
.PHONY: tools-test-javascript-summary
3939

@@ -45,6 +45,6 @@ tools-test-javascript-summary:
4545
# TODO: update once `test-node-versions` has been updated to accepting a `$FILES` list.
4646

4747
tools-test-node-versions:
48-
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-node-versions
48+
$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" NODE_FLAGS_TEST="$(NODE_FLAGS_TEST)" TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-node-versions
4949

5050
.PHONY: tools-test-node-versions

0 commit comments

Comments
 (0)