diff options
| author | David Neto <dneto@google.com> | 2022-12-09 19:58:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-09 19:58:10 -0500 |
| commit | 98d08e0dd34dae2f0b3fbe521610833ebb64497a (patch) | |
| tree | 24dcc763a5db022f063a41a5ed10cc872f574231 | |
| parent | 455e6ac86c1e42ba4e4e7cfe0629912cf28c1dea (diff) | |
| download | amber-98d08e0dd34dae2f0b3fbe521610833ebb64497a.tar.gz | |
Use cpplint/cpplint instead of google/styleguide's cpplint (#1008)
There are 128 errors for build/header_guard, so suppress that for now.
Fixes #1007
Change-Id: Ife9d482fd627dba07a4e454ecbfc58ea5ceac168
| -rw-r--r-- | DEPS | 5 | ||||
| -rw-r--r-- | src/vulkan/device.h | 4 | ||||
| -rwxr-xr-x | tools/run-lint.sh | 5 |
3 files changed, 8 insertions, 6 deletions
@@ -1,6 +1,7 @@ use_relative_paths = True vars = { + 'cpplint_git': 'https://github.com/cpplint', 'google_git': 'https://github.com/google', 'khronos_git': 'https://github.com/KhronosGroup', 'llvm_git': 'https://github.com/llvm', @@ -12,7 +13,7 @@ vars = { 'clspv_llvm_revision': 'b70366c9c430e1eadd59d5a1dfbb9c4d84f83de5', 'clspv_revision': 'f99809bdab1710846633b4ec24f5448263e75da7', - 'cpplint_revision': '26470f9ccb354ff2f6d098f831271a1833701b28', + 'cpplint_revision': 'fa12a0bbdafa15291276ddd2a2dcd2ac7a2ce4cb', 'dxc_revision': 'c45db48d565a9edc14b025e43b90e62264d06eea', 'glslang_revision': '81cc10a498b25a90147cccd6e8939493c1e9e20e', 'googletest_revision': '16f637fbf4ffc3f7a01fa4eceb7906634565242f', @@ -35,7 +36,7 @@ deps = { 'third_party/clspv-llvm': Var('llvm_git') + '/llvm-project.git@' + Var('clspv_llvm_revision'), - 'third_party/cpplint': Var('google_git') + '/styleguide.git@' + + 'third_party/cpplint': Var('cpplint_git') + '/cpplint.git@' + Var('cpplint_revision'), 'third_party/dxc': Var('microsoft_git') + '/DirectXShaderCompiler.git@' + diff --git a/src/vulkan/device.h b/src/vulkan/device.h index 8cd3ba1..ff76c0f 100644 --- a/src/vulkan/device.h +++ b/src/vulkan/device.h @@ -30,8 +30,8 @@ namespace amber { namespace vulkan { struct VulkanPtrs { -#include "vk-wrappers-1-0.h" // NOLINT(build/include) -#include "vk-wrappers-1-1.h" // NOLINT(build/include) +#include "vk-wrappers-1-0.h" // NOLINT(build/include_subdir) +#include "vk-wrappers-1-1.h" // NOLINT(build/include_subdir) }; /// Wrapper around a Vulkan Device object. diff --git a/tools/run-lint.sh b/tools/run-lint.sh index 40bc8a7..3fbaf93 100755 --- a/tools/run-lint.sh +++ b/tools/run-lint.sh @@ -15,5 +15,6 @@ set -e # fail on error -./third_party/cpplint/cpplint/cpplint.py `find src samples -type f` -./third_party/cpplint/cpplint/cpplint.py --root include `find ./include -type f` +FILTERS=-build/header_guard +./third_party/cpplint/cpplint.py --filter "$FILTERS" `find src samples -type f` +./third_party/cpplint/cpplint.py --filter "$FILTERS" --root include `find ./include -type f` |