Skip to content

Commit 47c255e

Browse files
krydosBenjamin Gruenbaum
authored andcommitted
build: run cpplint even if jslint failed
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>
1 parent bd7e0a3 commit 47c255e

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,11 @@ cpplint:
888888
@$(PYTHON) tools/check-imports.py
889889

890890
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
891-
lint: jslint cpplint
891+
lint:
892+
EXIT_STATUS=0 ; \
893+
$(MAKE) jslint || EXIT_STATUS=$$? ; \
894+
$(MAKE) cpplint || EXIT_STATUS=$$? ; \
895+
exit $$EXIT_STATUS
892896
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
893897
lint-ci: jslint-ci cpplint
894898
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \

0 commit comments

Comments
 (0)