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>
This commit is contained in:
parent
5717758279
commit
2a3d994cc2
17
CPPLINT.cfg
17
CPPLINT.cfg
|
@ -1 +1,18 @@
|
||||||
set noparent
|
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
|
||||||
|
|
|
@ -131,9 +131,11 @@ def _DoCommonChecks(input_api, output_api):
|
||||||
input_api, output_api))
|
input_api, output_api))
|
||||||
results.extend(
|
results.extend(
|
||||||
input_api.canned_checks.CheckDoNotSubmit(input_api, output_api))
|
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(
|
results.extend(
|
||||||
input_api.canned_checks.CheckChangeLintsClean(
|
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(
|
results.extend(
|
||||||
_CheckNonInclusiveLanguage(input_api, output_api,
|
_CheckNonInclusiveLanguage(input_api, output_api,
|
||||||
_NonInclusiveFileFilter))
|
_NonInclusiveFileFilter))
|
||||||
|
|
|
@ -2,7 +2,15 @@ filter=-build/include_order
|
||||||
filter=-build/include_what_you_use
|
filter=-build/include_what_you_use
|
||||||
filter=-build/namespaces
|
filter=-build/namespaces
|
||||||
filter=-readability/casting
|
filter=-readability/casting
|
||||||
|
filter=-readability/check
|
||||||
filter=-readability/namespace
|
filter=-readability/namespace
|
||||||
|
filter=-readability/todo
|
||||||
|
filter=-runtime/arrays
|
||||||
filter=-runtime/explicit
|
filter=-runtime/explicit
|
||||||
filter=-runtime/indentation_namespace
|
filter=-runtime/indentation_namespace
|
||||||
filter=-runtime/int
|
filter=-runtime/int
|
||||||
|
filter=-runtime/printf
|
||||||
|
filter=-runtime/threadsafe_fn
|
||||||
|
filter=-whitespace/blank_line
|
||||||
|
filter=-whitespace/comments
|
||||||
|
filter=-whitespace/todo
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <regex> // NOLINT(build/c++11)
|
#include <regex>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
|
@ -27,6 +27,10 @@ FILTER="-runtime/references"
|
||||||
FILES="`find src/tint -type f` `find src/tint/cmd -type f`"
|
FILES="`find src/tint -type f` `find src/tint/cmd -type f`"
|
||||||
FILES+="`find tools/src -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
|
if command -v go &> /dev/null; then
|
||||||
# Go is installed. Run cpplint in parallel for speed wins
|
# Go is installed. Run cpplint in parallel for speed wins
|
||||||
go run $SCRIPT_DIR/src/cmd/run-parallel/main.go \
|
go run $SCRIPT_DIR/src/cmd/run-parallel/main.go \
|
||||||
|
|
Loading…
Reference in New Issue