summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJohan Bergström <bugs@bergstroem.nu>2016-04-27 10:28:01 +1000
committerJohan Bergström <bugs@bergstroem.nu>2016-04-30 20:18:44 +1000
commit62c31fe39259b35df509311b88226628543103eb (patch)
treead2e4b56605f26450d4f132f8f24e8014d6b0a51 /Makefile
parentc1f2df9782f76733b93ff6fcb590058f370eb826 (diff)
downloadandroid-node-v8-62c31fe39259b35df509311b88226628543103eb.tar.gz
android-node-v8-62c31fe39259b35df509311b88226628543103eb.tar.bz2
android-node-v8-62c31fe39259b35df509311b88226628543103eb.zip
build: use shorthand lint target from test
Instead of invoking jslint/cpplint from the test target, call on the generic lint instead since it checks if eslint exists. Since our tarballs lacks eslint we now get a more graceful exit from `make test` instead of a traceback from jslint. PR-URL: https://github.com/nodejs/node/pull/6406 Fixes: https://github.com/nodejs/node/issues/6408 Reviewed-By: Ryan Graham <r.m.graham@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0931657dc5..604def253e 100644
--- a/Makefile
+++ b/Makefile
@@ -115,9 +115,9 @@ v8:
$(MAKE) -C deps/v8 $(V8_ARCH) $(V8_BUILD_OPTIONS)
test: | cctest # Depends on 'all'.
- $(PYTHON) tools/test.py --mode=release doctool message parallel sequential -J
- $(MAKE) jslint
- $(MAKE) cpplint
+ $(PYTHON) tools/test.py --mode=release -J \
+ doctool message parallel sequential
+ $(MAKE) lint
test-parallel: all
$(PYTHON) tools/test.py --mode=release parallel -J