Skip to content

Commit

Permalink
build: run cpplint even if jslint failed
Browse files Browse the repository at this point in the history
lint target now runs both linters
even if one of them failed.

PR-URL: #12276
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Alexey Orlenko <eaglexrlnk@gmail.com>
  • Loading branch information
krydos authored and evanlucas committed Apr 25, 2017
1 parent 3e32361 commit 43e0fd4
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -840,7 +840,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 ) \
Expand Down

0 comments on commit 43e0fd4

Please sign in to comment.