diff options
| author | Ruslan Bekenev <furyinbox@gmail.com> | 2017-04-07 22:07:14 +0300 |
|---|---|---|
| committer | Benjamin Gruenbaum <benji@tipranks.com> | 2017-04-14 21:50:09 +0300 |
| commit | 47c255ef68c54aa4a50ac0512c35fd3acc56b84f (patch) | |
| tree | 2f0e50c1c06e90b1d0daed8fc34d8670d36bf2af /Makefile | |
| parent | bd7e0a3f133a2111aabc627cc20eb6212acb9f03 (diff) | |
| download | android-node-v8-47c255ef68c54aa4a50ac0512c35fd3acc56b84f.tar.gz android-node-v8-47c255ef68c54aa4a50ac0512c35fd3acc56b84f.tar.bz2 android-node-v8-47c255ef68c54aa4a50ac0512c35fd3acc56b84f.zip | |
build: run cpplint even if jslint failed
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -888,7 +888,11 @@ cpplint: @$(PYTHON) tools/check-imports.py 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]+ lint-ci: jslint-ci cpplint @if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \ |