diff options
| author | 2019-02-07 22:12:04 +0000 | |
|---|---|---|
| committer | 2019-02-07 22:12:04 +0000 | |
| commit | 0b103de238180ef71a0178e90383198d60b49c37 (patch) | |
| tree | 084c225c7384878325fa9eca789ebf389cd822bc | |
| parent | 79974722c4bcb71a6235cf1a1072a67b746afd9c (diff) | |
| parent | aabca6c00f38bae094de5321ceff19f46f28a222 (diff) | |
Merge "idmap2: fix static checks"
| -rwxr-xr-x | cmds/idmap2/static-checks.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmds/idmap2/static-checks.sh b/cmds/idmap2/static-checks.sh index 57407102843b..41d3c69540b2 100755 --- a/cmds/idmap2/static-checks.sh +++ b/cmds/idmap2/static-checks.sh @@ -59,7 +59,7 @@ function _clang_format() function _bpfmt() { - local output="$(bpfmt -s -d $bp_files)" + local output="$(bpfmt -d $bp_files)" if [[ "$output" ]]; then echo "$output" return 1 @@ -72,6 +72,7 @@ function _cpplint() local cpplint="${ANDROID_BUILD_TOP}/tools/repohooks/tools/cpplint.py" local output="$($cpplint --quiet $cpp_files 2>&1 >/dev/null | grep -v \ -e 'Found C system header after C++ system header.' \ + -e 'Unknown NOLINT error category: cert-dcl50-cpp' \ -e 'Unknown NOLINT error category: misc-non-private-member-variables-in-classes' \ -e 'Unknown NOLINT error category: performance-unnecessary-copy-initialization' \ )" @@ -116,7 +117,7 @@ if [[ $opt_mode == "check" ]]; then exit $errors elif [[ $opt_mode == "fix" ]]; then clang-format -style=file -i $cpp_files - bpfmt -s -w $bp_files + bpfmt -w $bp_files exit 0 elif [[ $opt_mode == "help" ]]; then echo "Run static analysis tools such as clang-format and cpplint on the idmap2" |