Add support for specifying node flags

saurabhraghuvanshii · Jul 1, 2021 · 8656fa9 · 8656fa9
1 parent e653c9e
commit 8656fa9
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/tools/make/lib/benchmark/javascript.mk b/tools/make/lib/benchmark/javascript.mk
@@ -41,7 +41,7 @@ benchmark-javascript: $(NODE_MODULES)
 		echo "Running benchmark: $$file"; \
 		NODE_ENV="$(NODE_ENV_BENCHMARK)" \
 		NODE_PATH="$(NODE_PATH_BENCHMARK)" \
-		$(NODE) $$file || exit 1; \
+		$(NODE) $(NODE_FLAGS_BENCHMARK) $$file || exit 1; \
 	done
 
 .PHONY: benchmark-javascript
@@ -66,7 +66,7 @@ benchmark-javascript-files: $(NODE_MODULES)
 		echo "Running benchmark: $$file"; \
 		NODE_ENV="$(NODE_ENV_BENCHMARK)" \
 		NODE_PATH="$(NODE_PATH_BENCHMARK)" \
-		$(NODE) $$file || exit 1; \
+		$(NODE) $(NODE_FLAGS_BENCHMARK) $$file || exit 1; \
 	done
 
 .PHONY: benchmark-javascript-files
diff --git a/tools/make/lib/examples/javascript.mk b/tools/make/lib/examples/javascript.mk
@@ -41,7 +41,7 @@ examples-javascript: $(NODE_MODULES)
 		echo "Running example: $$file"; \
 		NODE_ENV="$(NODE_ENV_EXAMPLES)" \
 		NODE_PATH="$(NODE_PATH_EXAMPLES)" \
-		$(NODE) $$file || exit 1; \
+		$(NODE) $(NODE_FLAGS_EXAMPLES) $$file || exit 1; \
 	done
 
 .PHONY: examples-javascript
@@ -66,7 +66,7 @@ examples-javascript-files: $(NODE_MODULES)
 		echo "Running example: $$file"; \
 		NODE_ENV="$(NODE_ENV_EXAMPLES)" \
 		NODE_PATH="$(NODE_PATH_EXAMPLES)" \
-		$(NODE) $$file || exit 1; \
+		$(NODE) $(NODE_FLAGS_EXAMPLES) $$file || exit 1; \
 	done
 
 .PHONY: examples-javascript-files
diff --git a/tools/make/lib/repl/node.mk b/tools/make/lib/repl/node.mk
@@ -41,6 +41,6 @@ repl-node: $(NODE_MODULES) $(STDLIB)
 	$(QUIET) cd $(REPL_DIR); \
 	NODE_ENV="$(NODE_ENV_REPL)" \
 	NODE_PATH="$(NODE_PATH_REPL)" \
-	$(NODE) $(STDLIB) $(REPL) -- $(REPL_FLAGS)
+	$(NODE) $(NODE_FLAGS_REPL) $(STDLIB) $(REPL) -- $(REPL_FLAGS)
 
 .PHONY: repl-node
diff --git a/tools/make/lib/test/javascript.mk b/tools/make/lib/test/javascript.mk
@@ -63,7 +63,7 @@ test-javascript-local: $(NODE_MODULES)
 		echo "Running test: $$test"; \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_REPORTER) || exit 1; \
@@ -82,7 +82,7 @@ test-javascript-files-local: $(NODE_MODULES)
 		echo "Running test: $$test"; \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_REPORTER) || exit 1; \
@@ -101,7 +101,7 @@ test-javascript-summary: $(NODE_MODULES)
 		echo "Running test: $$test"; \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_SUMMARY) || exit 1; \
@@ -120,7 +120,7 @@ test-javascript-files-summary: $(NODE_MODULES)
 		echo "Running test: $$test"; \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_SUMMARY) || exit 1; \
@@ -137,7 +137,7 @@ test-javascript-tap: $(NODE_MODULES)
 	$(QUIET) $(FIND_TESTS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r test; do \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test; \
 	done
@@ -153,7 +153,7 @@ test-javascript-files-tap: $(NODE_MODULES)
 	$(QUIET) for test in $(FILES); do \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test; \
 	done
@@ -169,7 +169,7 @@ test-javascript-xunit: $(NODE_MODULES)
 	$(QUIET) $(FIND_TESTS_CMD) | grep '^[\/]\|^[a-zA-Z]:[/\]' | while read -r test; do \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_XUNIT) || exit 1; \
@@ -186,7 +186,7 @@ test-javascript-files-xunit: $(NODE_MODULES)
 	$(QUIET) for test in $(FILES); do \
 		NODE_ENV="$(NODE_ENV_TEST)" \
 		NODE_PATH="$(NODE_PATH_TEST)" \
-		$(JAVASCRIPT_TEST) \
+		$(NODE) $(NODE_FLAGS_TEST) $(JAVASCRIPT_TEST) \
 			$(JAVASCRIPT_TEST_FLAGS) \
 			$$test \
 		| $(TAP_XUNIT) || exit 1; \

diff --git a/tools/make/lib/tools-test-cov/javascript.mk b/tools/make/lib/tools-test-cov/javascript.mk
@@ -31,7 +31,7 @@ endif
 
 tools-test-javascript-cov:
 ifeq ($(JAVASCRIPT_CODE_INSTRUMENTER), istanbul)
-	$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" $(MAKE) -f $(this_file) tools-test-istanbul
+	$(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
 endif
 
 .PHONY: tools-test-javascript-cov
diff --git a/tools/make/lib/tools-test/javascript.mk b/tools/make/lib/tools-test/javascript.mk
@@ -23,7 +23,7 @@
 # This target runs JavaScript unit tests using a specified test runner and pipes TAP output to a reporter.
 
 tools-test-javascript:
-	$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files
+	$(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
 
 .PHONY: tools-test-javascript
 
@@ -33,7 +33,7 @@ tools-test-javascript:
 # This target runs JavaScript unit tests and aggregates TAP output as a test summary.
 
 tools-test-javascript-summary:
-	$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" FILES="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-files-summary
+	$(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
 
 .PHONY: tools-test-javascript-summary
 
@@ -45,6 +45,6 @@ tools-test-javascript-summary:
 # TODO: update once `test-node-versions` has been updated to accepting a `$FILES` list.
 
 tools-test-node-versions:
-	$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-node-versions
+	$(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
 
 .PHONY: tools-test-node-versions