From 1646c6a343e4c220048efb81fdea55cb06815826 Mon Sep 17 00:00:00 2001 From: Ruslan Bekenev Date: Fri, 7 Apr 2017 22:07:14 +0300 Subject: [PATCH] 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 Reviewed-By: Alexey Orlenko --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 7bc0a33bddbf8c..c7ad4eabdfa162 100644 --- a/Makefile +++ b/Makefile @@ -765,7 +765,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 ) \