Skip to content

Commit

Permalink
build: use echo command instead of shell comments
Browse files Browse the repository at this point in the history
Currently, there are a few recipes where comments are indented
and being passed to the shell.

This commit updates these comments to use the echo command instead,
which is the more common approach used in other recipes in the
makefile.

PR-URL: #22293
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Jon Moss <me@jonathanmoss.me>
  • Loading branch information
danbev committed Aug 20, 2018
1 parent 79642ae commit 6bc43ae
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -266,26 +266,26 @@ jstest: build-addons build-addons-napi ## Runs addon tests and JS tests
.PHONY: test
# This does not run tests of third-party libraries inside deps.
test: all ## Runs default tests, linters, and builds docs.
# Build the addons before running the tests so the test results
# can be displayed together
@echo "Build the addons before running the tests so the test results"
@echo "can be displayed together"
$(MAKE) -s build-addons
$(MAKE) -s build-addons-napi
$(MAKE) -s cctest
$(MAKE) -s jstest

.PHONY: test-only
test-only: all ## For a quick test, does not run linter or build docs.
# Build the addons before running the tests so the test results
# can be displayed together
@echo "Build the addons before running the tests so the test results"
@echo "can be displayed together"
$(MAKE) build-addons
$(MAKE) build-addons-napi
$(MAKE) cctest
$(MAKE) jstest

# Used by `make coverage-test`
test-cov: all
# Build the addons before running the tests so the test results
# can be displayed together
@echo "Build the addons before running the tests so the test results"
@echo "can be displayed together"
$(MAKE) build-addons
$(MAKE) build-addons-napi
# $(MAKE) cctest
Expand Down Expand Up @@ -399,7 +399,7 @@ build-addons-napi: | $(NODE_EXE) test/addons-napi/.buildstamp

.PHONY: clear-stalled
clear-stalled:
# Clean up any leftover processes but don't error if found.
@echo "Clean up any leftover processes but don't error if found."
ps awwx | grep Release/node | grep -v grep | cat
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
if [ "$${PS_OUT}" ]; then \
Expand Down Expand Up @@ -437,7 +437,7 @@ test-ci-js: | clear-stalled
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_JS_SUITES)
# Clean up any leftover processes, error if found.
@echo "Clean up any leftover processes, error if found."
ps awwx | grep Release/node | grep -v grep | cat
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
if [ "$${PS_OUT}" ]; then \
Expand All @@ -452,7 +452,7 @@ test-ci: | clear-stalled build-addons build-addons-napi doc-only
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES) $(CI_DOC)
# Clean up any leftover processes, error if found.
@echo "Clean up any leftover processes, error if found."
ps awwx | grep Release/node | grep -v grep | cat
@PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
if [ "$${PS_OUT}" ]; then \
Expand Down

0 comments on commit 6bc43ae

Please sign in to comment.