Wrap env vars in quotes and set env vars for submake

kgryte · kgryte · commit 80e6ac2c79ac · 2018-01-18T21:32:16.000-08:00
diff --git a/tools/make/lib/test-browsers/Makefile b/tools/make/lib/test-browsers/Makefile
@@ -55,7 +55,7 @@ endif
 
 test-browsers: $(NODE_MODULES)
 	$(QUIET) NODE_ENV=$(NODE_ENV_TEST) \
-	NODE_PATH=$(NODE_PATH_TEST) \
+	NODE_PATH="$(NODE_PATH_TEST)" \
 	$(BROWSERIFY) \
 		$(BROWSERIFY_BROWSER_TEST_FLAGS) \
 		$(TESTS) \
diff --git a/tools/make/lib/test-browsers/testling.mk b/tools/make/lib/test-browsers/testling.mk
@@ -42,7 +42,7 @@ BROWSER_TEST_FLAGS ?=
 # [1]: https://github.com/substack/testling
 
 view-testling: $(NODE_MODULES)
-	$(QUIET) NODE_ENV=$(NODE_ENV_TEST) \
+	$(QUIET) NODE_ENV="$(NODE_ENV_TEST)" \
 	$(BROWSERIFY) \
 		$(BROWSERIFY_FLAGS) \
 		$(TESTS) \
diff --git a/tools/make/lib/test-cov/istanbul.mk b/tools/make/lib/test-cov/istanbul.mk
@@ -158,8 +158,8 @@ test-istanbul: $(NODE_MODULES) test-istanbul-instrument
 		echo ''; \
 		echo "Running tests in directory: $$dir"; \
 		echo ''; \
-		NODE_ENV=$(NODE_ENV_TEST) \
-		NODE_PATH=$(NODE_PATH_TEST) \
+		NODE_ENV="$(NODE_ENV_TEST)" \
+		NODE_PATH="$(NODE_PATH_TEST)" \
 		TEST_MODE=coverage \
 		$(ISTANBUL_TEST_RUNNER) \
 			$(ISTANBUL_TEST_RUNNER_FLAGS) \
@@ -187,8 +187,8 @@ test-istanbul-report: $(NODE_MODULES)
 # This target instruments source code, runs unit tests, and outputs a test coverage report.
 
 test-istanbul-cover: $(NODE_MODULES)
-	$(QUIET) NODE_ENV=$(NODE_ENV_TEST) \
-	NODE_PATH=$(NODE_PATH_TEST) \
+	$(QUIET) NODE_ENV="$(NODE_ENV_TEST)" \
+	NODE_PATH="$(NODE_PATH_TEST)" \
 	$(ISTANBUL_COVER) $(ISTANBUL_COVER_FLAGS) $(JAVASCRIPT_TEST) -- $(JAVASCRIPT_TEST_FLAGS) $(TESTS)
 
 .PHONY: test-istanbul-cover
diff --git a/tools/make/lib/test-cov/javascript.mk b/tools/make/lib/test-cov/javascript.mk
@@ -31,7 +31,7 @@ endif
 
 test-javascript-cov: clean-javascript-cov
 ifeq ($(JAVASCRIPT_CODE_INSTRUMENTER), istanbul)
-	$(QUIET) $(MAKE) -f $(this_file) test-istanbul
+	$(QUIET) NODE_ENV_TEST="$(NODE_ENV_TEST)" NODE_PATH_TEST="$(NODE_PATH_TEST)" $(MAKE) -f $(this_file) test-istanbul
 endif
 
 .PHONY: test-javascript-cov
diff --git a/tools/make/lib/test-fixtures/c.mk b/tools/make/lib/test-fixtures/c.mk
@@ -28,7 +28,7 @@ test-fixtures-c:
 		echo "Generating test fixtures: $$file"; \
 		cd `dirname $$file` && \
 		$(MAKE) clean && \
-		CEPHES=$(DEPS_CEPHES_BUILD_OUT) CEPHES_SRC="$(DEPS_CEPHES_SRC)" $(MAKE) && \
+		CEPHES="$(DEPS_CEPHES_BUILD_OUT)" CEPHES_SRC="$(DEPS_CEPHES_SRC)" $(MAKE) && \
 		$(MAKE) run || exit 1; \
 	done
 
@@ -45,7 +45,7 @@ test-fixtures-c-files:
 		echo "Generating test fixtures: $$file"; \
 		cd `dirname $$file` && \
 		$(MAKE) clean && \
-		CEPHES=$(DEPS_CEPHES_BUILD_OUT) CEPHES_SRC="$(DEPS_CEPHES_SRC)" $(MAKE) && \
+		CEPHES="$(DEPS_CEPHES_BUILD_OUT)" CEPHES_SRC="$(DEPS_CEPHES_SRC)" $(MAKE) && \
 		$(MAKE) run || exit 1; \
 	done
 
diff --git a/tools/make/lib/test-fixtures/cpp.mk b/tools/make/lib/test-fixtures/cpp.mk
@@ -28,7 +28,7 @@ test-fixtures-cpp:
 		echo "Generating test fixtures: $$file"; \
 		cd `dirname $$file` && \
 		$(MAKE) clean && \
-		BOOST=$(DEPS_BOOST_BUILD_OUT) $(MAKE) && \
+		BOOST="$(DEPS_BOOST_BUILD_OUT)" $(MAKE) && \
 		$(MAKE) run || exit 1; \
 	done
 
@@ -45,7 +45,7 @@ test-fixtures-cpp-files:
 		echo "Generating test fixtures: $$file"; \
 		cd `dirname $$file` && \
 		$(MAKE) clean && \
-		BOOST=$(DEPS_BOOST_BUILD_OUT) $(MAKE) && \
+		BOOST="$(DEPS_BOOST_BUILD_OUT)" $(MAKE) && \
 		$(MAKE) run || exit 1; \
 	done
 
