Skip to content

Commit 7c335f6

Browse files
krydosMylesBorins
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 3c1bd05 commit 7c335f6

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Diff for: Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,11 @@ cpplint:
765765
@$(PYTHON) tools/check-imports.py
766766

767767
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
768-
lint: jslint cpplint
768+
lint:
769+
EXIT_STATUS=0 ; \
770+
$(MAKE) jslint || EXIT_STATUS=$$? ; \
771+
$(MAKE) cpplint || EXIT_STATUS=$$? ; \
772+
exit $$EXIT_STATUS
769773
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
770774
lint-ci: jslint-ci cpplint
771775
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \

0 commit comments

Comments
 (0)