1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build: run cpplint even if jslint failed

Browse Source 
lint target now runs both linters
even if one of them failed.

PR-URL: https://github.com/nodejs/node/pull/12276
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
This commit is contained in:
Ruslan Bekenev 2017-04-07 22:07:14 +03:00 committed by Benjamin Gruenbaum
parent bd7e0a3f13
commit 47c255ef68
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -888,7 +888,11 @@ cpplint:
@$(PYTHON) tools/check-imports.py @$(PYTHON) tools/check-imports.py
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)") ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
lint: jslint cpplint lint:
EXIT_STATUS=0 ; \
$(MAKE) jslint || EXIT_STATUS=$$? ; \
$(MAKE) cpplint || EXIT_STATUS=$$? ; \
exit $$EXIT_STATUS
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+ CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
lint-ci: jslint-ci cpplint lint-ci: jslint-ci cpplint
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \ @if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \