Simplify recipes by using existing targets

kgryte · kgryte · commit 3ae5fb306694 · 2016-10-29T01:33:03.000-07:00
diff --git a/tools/make/lib/tools-test/Makefile b/tools/make/lib/tools-test/Makefile
@@ -1,23 +1,4 @@
 
-# VARIABLES #
-
-# Define the path to the `tap-spec` executable:
-#
-# To install tap-spec:
-#     $ npm install tap-spec
-#
-# [1]: https://github.com/scottcorgan/tap-spec
-TAP_REPORTER ?= $(BIN_DIR)/tap-spec
-
-# Define the path to the `tap-summary` executable:
-#
-# To install tap-summary:
-#     $ npm install tap-summary
-#
-# [1]: https://github.com/zoubin/tap-summary
-TAP_SUMMARY ?= $(BIN_DIR)/tap-summary
-
-
 # DEPENDENCIES #
 
 include $(TOOLS_MAKE_LIB_DIR)/tools-test/javascript.mk
diff --git a/tools/make/lib/tools-test/javascript.mk b/tools/make/lib/tools-test/javascript.mk
@@ -1,50 +1,12 @@
 
-# VARIABLES #
-
-# Define the command for setting executable permissions:
-MAKE_EXECUTABLE ?= chmod +x
-
-# Define the Node environment:
-NODE_ENV_TEST ?= $(NODE_ENV)
-
-# Define the Node path:
-NODE_PATH_TEST ?= $(NODE_PATH)
-
-# Define the test runner to use when running JavaScript tests:
-JAVASCRIPT_TEST_RUNNER ?= tape
-
-# Define test runner to use when running JavaScript tests across multiple Node.js versions:
-JAVASCRIPT_TEST_NODE_VERSIONS ?= $(TOOLS_DIR)/test/scripts/test_node_versions
-
-# Define the command-line options to be used when invoking the versions runner:
-JAVASCRIPT_TEST_NODE_VERSIONS_FLAGS ?= \
-	--versions $(NODE_VERSIONS)
-
-
-# DEPENDENCIES #
-
-ifeq ($(JAVASCRIPT_TEST_RUNNER), tape)
-	include $(TOOLS_MAKE_LIB_DIR)/test/tape.mk
-endif
-
-
 # TARGETS #
 
 # Run JavaScript unit tests.
 #
 # This target runs JavaScript unit tests using a specified test runner and pipes TAP output to a reporter.
 
 tools-test-javascript: $(NODE_MODULES)
-	$(QUIET) for test in $(TOOLS_TESTS); do \
-		echo ''; \
-		echo "Running test: $$test"; \
-		NODE_ENV=$(NODE_ENV_TEST) \
-		NODE_PATH=$(NODE_PATH_TEST) \
-		$(JAVASCRIPT_TEST) \
-			$(JAVASCRIPT_TEST_FLAGS) \
-			$$test \
-		| $(TAP_REPORTER) || exit 1; \
-	done
+	$(QUIET) TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript
 
 .PHONY: tools-test-javascript
 
@@ -54,16 +16,7 @@ tools-test-javascript: $(NODE_MODULES)
 # This target runs JavaScript unit tests and aggregates TAP output as a test summary.
 
 tools-test-javascript-summary: $(NODE_MODULES)
-	$(QUIET) for test in $(TOOLS_TESTS); do \
-		echo ''; \
-		echo "Running test: $$test"; \
-		NODE_ENV=$(NODE_ENV_TEST) \
-		NODE_PATH=$(NODE_PATH_TEST) \
-		$(JAVASCRIPT_TEST) \
-			$(JAVASCRIPT_TEST_FLAGS) \
-			$$test \
-		| $(TAP_SUMMARY) || exit 1; \
-	done
+	$(QUIET) TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-javascript-summary
 
 .PHONY: tools-test-javascript-summary
 
@@ -73,7 +26,6 @@ tools-test-javascript-summary: $(NODE_MODULES)
 # This targets runs JavaScript unit tests against specific Node.js versions.
 
 tools-test-node-versions: $(NODE_MODULES)
-	$(QUIET) $(MAKE_EXECUTABLE) $(JAVASCRIPT_TEST_NODE_VERSIONS)
-	$(QUIET) $(JAVASCRIPT_TEST_NODE_VERSIONS) $(JAVASCRIPT_TEST_NODE_VERSIONS_FLAGS) $(TOOLS_TESTS)
+	$(QUIET) TESTS="$(TOOLS_TESTS)" $(MAKE) -f $(this_file) test-node-versions
 
 .PHONY: tools-test-node-versions
