Skip to content

Commit 4d9e671

Browse files
krydosevanlucas
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 <[email protected]> Reviewed-By: Alexey Orlenko <[email protected]>
1 parent e2d66ab commit 4d9e671

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

Makefile

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

842842
ifneq ("","$(wildcard tools/eslint/lib/eslint.js)")
843-
lint: jslint cpplint
843+
lint:
844+
EXIT_STATUS=0 ; \
845+
$(MAKE) jslint || EXIT_STATUS=$$? ; \
846+
$(MAKE) cpplint || EXIT_STATUS=$$? ; \
847+
exit $$EXIT_STATUS
844848
CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+
845849
lint-ci: jslint-ci cpplint
846850
@if ! ( grep -IEqrs "$(CONFLICT_RE)" benchmark deps doc lib src test tools ) \

0 commit comments

Comments
 (0)