Fixup CQ and Kokoro lint mismatches.
The kokoro bots are running at a different level of verbosity than
the presubmit check. This CL ups the verbosity level for presubmit
to match kokoro and suppresses any new lint warnings which are
produced by the change.
The set of always removed filter options used by PRESUBMIT are
copied into the CPPLINT.cfg main file in order for kokoro to
match the errors presented by the CQ.
Bug: dawn:1339
Change-Id: I875a06bc2ed929d5dbaaa933282e3afa2559a7af
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86627
Reviewed-by: Ben Clayton <bclayton@google.com>
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
diff --git a/CPPLINT.cfg b/CPPLINT.cfg
index 36d9cb2..407dec8 100644
--- a/CPPLINT.cfg
+++ b/CPPLINT.cfg
@@ -1 +1,18 @@
set noparent
+
+# This set of removals is set to match the set of
+# OFF_UNLESS_MANUALLY_ENABLED_LINT_FEATURES from the depot_tools
+# presubmit_canned_checks.py file.
+filter=-build/c++11
+filter=-runtime/references
+filter=-whitespace/braces
+filter=-whitespace/comma
+filter=-whitespace/end_of_line
+filter=-whitespace/forcolon
+filter=-whitespace/indent
+filter=-whitespace/line_length
+filter=-whitespace/newline
+filter=-whitespace/operators
+filter=-whitespace/parens
+filter=-whitespace/semicolon
+filter=-whitespace/tab
diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 9280eb6..8520b75 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -131,9 +131,11 @@
input_api, output_api))
results.extend(
input_api.canned_checks.CheckDoNotSubmit(input_api, output_api))
+ # Note, the verbose_level here should match what is set in tools/lint so
+ # the same set of lint errors are reported on the CQ and Kokoro bots.
results.extend(
input_api.canned_checks.CheckChangeLintsClean(
- input_api, output_api, lint_filters=LINT_FILTERS))
+ input_api, output_api, lint_filters=LINT_FILTERS, verbose_level=1))
results.extend(
_CheckNonInclusiveLanguage(input_api, output_api,
_NonInclusiveFileFilter))
diff --git a/src/dawn/CPPLINT.cfg b/src/dawn/CPPLINT.cfg
index 82132f2..4f810e8 100644
--- a/src/dawn/CPPLINT.cfg
+++ b/src/dawn/CPPLINT.cfg
@@ -2,7 +2,15 @@
filter=-build/include_what_you_use
filter=-build/namespaces
filter=-readability/casting
+filter=-readability/check
filter=-readability/namespace
+filter=-readability/todo
+filter=-runtime/arrays
filter=-runtime/explicit
filter=-runtime/indentation_namespace
filter=-runtime/int
+filter=-runtime/printf
+filter=-runtime/threadsafe_fn
+filter=-whitespace/blank_line
+filter=-whitespace/comments
+filter=-whitespace/todo
diff --git a/src/tint/fuzzers/tint_regex_fuzzer/wgsl_mutator.cc b/src/tint/fuzzers/tint_regex_fuzzer/wgsl_mutator.cc
index d507944..2397e7f 100644
--- a/src/tint/fuzzers/tint_regex_fuzzer/wgsl_mutator.cc
+++ b/src/tint/fuzzers/tint_regex_fuzzer/wgsl_mutator.cc
@@ -17,7 +17,7 @@
#include <cassert>
#include <cstring>
#include <map>
-#include <regex> // NOLINT(build/c++11)
+#include <regex>
#include <string>
#include <utility>
#include <vector>
diff --git a/tools/lint b/tools/lint
index 0aa38ba..94a96b6 100755
--- a/tools/lint
+++ b/tools/lint
@@ -27,6 +27,10 @@
FILES="`find src/tint -type f` `find src/tint/cmd -type f`"
FILES+="`find tools/src -type f` `find src/tint/cmd -type f`"
+# Note, there is currently no verbosity level set for cpplint.py which means
+# it will use the default level of 1. This level needs to match what is in the
+# PRESUBMIT.py file in order to report the same errors between CQ and Kokoro.
+
if command -v go &> /dev/null; then
# Go is installed. Run cpplint in parallel for speed wins
go run $SCRIPT_DIR/src/cmd/run-parallel/main.go \
