Enable build/header_guard This CL enables the build/header_guard lint check. The existing headers which failed the check were updated, missing headers added. An exclusion file for the generator templates was added as well. Bug: dawn:1339 Change-Id: If572e460179ad501293d5d6cf01e0ea900daa979 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86207 Reviewed-by: Ben Clayton <bclayton@google.com> Auto-Submit: Dan Sinclair <dsinclair@chromium.org> Commit-Queue: Dan Sinclair <dsinclair@chromium.org>
diff --git a/src/dawn/tests/DawnNativeTest.h b/src/dawn/tests/DawnNativeTest.h index 9e8df19..8d6fd8e 100644 --- a/src/dawn/tests/DawnNativeTest.h +++ b/src/dawn/tests/DawnNativeTest.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_DAWNNATIVETEST_H_ -#define TESTS_DAWNNATIVETEST_H_ +#ifndef SRC_DAWN_TESTS_DAWNNATIVETEST_H_ +#define SRC_DAWN_TESTS_DAWNNATIVETEST_H_ #include <gtest/gtest.h> @@ -50,4 +50,4 @@ static void OnDeviceError(WGPUErrorType type, const char* message, void* userdata); }; -#endif // TESTS_DAWNNATIVETEST_H_ +#endif // SRC_DAWN_TESTS_DAWNNATIVETEST_H_
diff --git a/src/dawn/tests/DawnTest.h b/src/dawn/tests/DawnTest.h index 877b2fc..8cee751 100644 --- a/src/dawn/tests/DawnTest.h +++ b/src/dawn/tests/DawnTest.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_DAWNTEST_H_ -#define TESTS_DAWNTEST_H_ +#ifndef SRC_DAWN_TESTS_DAWNTEST_H_ +#define SRC_DAWN_TESTS_DAWNTEST_H_ #include "dawn/common/Log.h" #include "dawn/common/Platform.h" @@ -795,4 +795,4 @@ } // namespace detail -#endif // TESTS_DAWNTEST_H_ +#endif // SRC_DAWN_TESTS_DAWNTEST_H_
diff --git a/src/dawn/tests/MockCallback.h b/src/dawn/tests/MockCallback.h index 2b795ed..c41139c 100644 --- a/src/dawn/tests/MockCallback.h +++ b/src/dawn/tests/MockCallback.h
@@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#ifndef SRC_DAWN_TESTS_MOCKCALLBACK_H_ +#define SRC_DAWN_TESTS_MOCKCALLBACK_H_ + #include <gmock/gmock.h> #include "dawn/common/Assert.h" @@ -99,3 +102,5 @@ }; } // namespace testing + +#endif // SRC_DAWN_TESTS_MOCKCALLBACK_H_
diff --git a/src/dawn/tests/ParamGenerator.h b/src/dawn/tests/ParamGenerator.h index c90591d..3ce0429 100644 --- a/src/dawn/tests/ParamGenerator.h +++ b/src/dawn/tests/ParamGenerator.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_PARAMGENERATOR_H_ -#define TESTS_PARAMGENERATOR_H_ +#ifndef SRC_DAWN_TESTS_PARAMGENERATOR_H_ +#define SRC_DAWN_TESTS_PARAMGENERATOR_H_ #include <tuple> #include <vector> @@ -137,4 +137,4 @@ std::forward<std::vector<Params>&&>(params)...); } -#endif // TESTS_PARAMGENERATOR_H_ +#endif // SRC_DAWN_TESTS_PARAMGENERATOR_H_
diff --git a/src/dawn/tests/ToggleParser.h b/src/dawn/tests/ToggleParser.h index d5ff90b..e6f949f 100644 --- a/src/dawn/tests/ToggleParser.h +++ b/src/dawn/tests/ToggleParser.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_TOGGLEPARSER_H_ -#define TESTS_TOGGLEPARSER_H_ +#ifndef SRC_DAWN_TESTS_TOGGLEPARSER_H_ +#define SRC_DAWN_TESTS_TOGGLEPARSER_H_ #include <string> #include <vector> @@ -34,4 +34,4 @@ std::vector<std::string> mDisabledToggles; }; -#endif // TESTS_TOGGLEPARSER_H_ +#endif // SRC_DAWN_TESTS_TOGGLEPARSER_H_
diff --git a/src/dawn/tests/end2end/VideoViewsTests.h b/src/dawn/tests/end2end/VideoViewsTests.h index 60d93a0..6c659bb 100644 --- a/src/dawn/tests/end2end/VideoViewsTests.h +++ b/src/dawn/tests/end2end/VideoViewsTests.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_VIDEOVIEWSTESTS_H_ -#define TESTS_VIDEOVIEWSTESTS_H_ +#ifndef SRC_DAWN_TESTS_END2END_VIDEOVIEWSTESTS_H_ +#define SRC_DAWN_TESTS_END2END_VIDEOVIEWSTESTS_H_ #include "dawn/tests/DawnTest.h" @@ -92,4 +92,4 @@ bool mIsMultiPlanarFormatsSupported = false; }; -#endif // TESTS_VIDEOVIEWSTESTS_H_ +#endif // SRC_DAWN_TESTS_END2END_VIDEOVIEWSTESTS_H_
diff --git a/src/dawn/tests/perf_tests/DawnPerfTest.h b/src/dawn/tests/perf_tests/DawnPerfTest.h index 548d212..1698dc0 100644 --- a/src/dawn/tests/perf_tests/DawnPerfTest.h +++ b/src/dawn/tests/perf_tests/DawnPerfTest.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_PERFTESTS_DAWNPERFTEST_H_ -#define TESTS_PERFTESTS_DAWNPERFTEST_H_ +#ifndef SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTEST_H_ +#define SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTEST_H_ #include "dawn/tests/DawnTest.h" @@ -127,4 +127,4 @@ using DawnPerfTest = DawnPerfTestWithParams<>; -#endif // TESTS_PERFTESTS_DAWNPERFTEST_H_ +#endif // SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTEST_H_
diff --git a/src/dawn/tests/perf_tests/DawnPerfTestPlatform.h b/src/dawn/tests/perf_tests/DawnPerfTestPlatform.h index f41d6d9..adc567f 100644 --- a/src/dawn/tests/perf_tests/DawnPerfTestPlatform.h +++ b/src/dawn/tests/perf_tests/DawnPerfTestPlatform.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_PERFTESTS_DAWNPERFTESTPLATFORM_H_ -#define TESTS_PERFTESTS_DAWNPERFTESTPLATFORM_H_ +#ifndef SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTESTPLATFORM_H_ +#define SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTESTPLATFORM_H_ #include "dawn/platform/DawnPlatform.h" @@ -88,4 +88,4 @@ std::mutex mTraceEventBufferMapMutex; }; -#endif // TESTS_PERFTESTS_DAWNPERFTESTPLATFORM_H_ +#endif // SRC_DAWN_TESTS_PERF_TESTS_DAWNPERFTESTPLATFORM_H_
diff --git a/src/dawn/tests/unittests/native/mocks/BindGroupLayoutMock.h b/src/dawn/tests/unittests/native/mocks/BindGroupLayoutMock.h index 8135f0c..6ed7727 100644 --- a/src/dawn/tests/unittests/native/mocks/BindGroupLayoutMock.h +++ b/src/dawn/tests/unittests/native/mocks/BindGroupLayoutMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUT_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUT_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUTMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUTMOCK_H_ #include "dawn/native/BindGroupLayout.h" #include "dawn/native/Device.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUT_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPLAYOUTMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/BindGroupMock.h b/src/dawn/tests/unittests/native/mocks/BindGroupMock.h index f6a2370..02f82b0 100644 --- a/src/dawn/tests/unittests/native/mocks/BindGroupMock.h +++ b/src/dawn/tests/unittests/native/mocks/BindGroupMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUP_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUP_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPMOCK_H_ #include "dawn/native/BindGroup.h" #include "dawn/native/Device.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUP_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUPMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/BufferMock.h b/src/dawn/tests/unittests/native/mocks/BufferMock.h index 8f17d1d..6955e7c 100644 --- a/src/dawn/tests/unittests/native/mocks/BufferMock.h +++ b/src/dawn/tests/unittests/native/mocks/BufferMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_BUFFER_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_BUFFER_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BUFFERMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BUFFERMOCK_H_ #include "dawn/native/Buffer.h" #include "dawn/native/Device.h" @@ -46,4 +46,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_BINDGROUP_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_BUFFERMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/CommandBufferMock.h b/src/dawn/tests/unittests/native/mocks/CommandBufferMock.h index 7f0198b..65d3168 100644 --- a/src/dawn/tests/unittests/native/mocks/CommandBufferMock.h +++ b/src/dawn/tests/unittests/native/mocks/CommandBufferMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFER_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFER_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFERMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFERMOCK_H_ #include "dawn/native/CommandBuffer.h" #include "dawn/native/Device.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFER_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMMANDBUFFERMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/ComputePipelineMock.h b/src/dawn/tests/unittests/native/mocks/ComputePipelineMock.h index 6071051..b7bb467 100644 --- a/src/dawn/tests/unittests/native/mocks/ComputePipelineMock.h +++ b/src/dawn/tests/unittests/native/mocks/ComputePipelineMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINEMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINEMOCK_H_ #include "dawn/native/ComputePipeline.h" #include "dawn/native/Device.h" @@ -38,4 +38,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_COMPUTEPIPELINEMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/DeviceMock.h b/src/dawn/tests/unittests/native/mocks/DeviceMock.h index d0d5c31..7639e81 100644 --- a/src/dawn/tests/unittests/native/mocks/DeviceMock.h +++ b/src/dawn/tests/unittests/native/mocks/DeviceMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_DEVICE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_DEVICE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_DEVICEMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_DEVICEMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/RenderPipeline.h" @@ -118,4 +118,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_DEVICE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_DEVICEMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/ExternalTextureMock.h b/src/dawn/tests/unittests/native/mocks/ExternalTextureMock.h index c40276b..5de8065 100644 --- a/src/dawn/tests/unittests/native/mocks/ExternalTextureMock.h +++ b/src/dawn/tests/unittests/native/mocks/ExternalTextureMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTURE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTURE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTUREMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTUREMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/ExternalTexture.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTURE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_EXTERNALTEXTUREMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/PipelineLayoutMock.h b/src/dawn/tests/unittests/native/mocks/PipelineLayoutMock.h index 7e82a40..5b31e4b 100644 --- a/src/dawn/tests/unittests/native/mocks/PipelineLayoutMock.h +++ b/src/dawn/tests/unittests/native/mocks/PipelineLayoutMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUT_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUT_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUTMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUTMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/PipelineLayout.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUT_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_PIPELINELAYOUTMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/QuerySetMock.h b/src/dawn/tests/unittests/native/mocks/QuerySetMock.h index c4b8349..43aa27f 100644 --- a/src/dawn/tests/unittests/native/mocks/QuerySetMock.h +++ b/src/dawn/tests/unittests/native/mocks/QuerySetMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSET_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSET_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSETMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSETMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/QuerySet.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSET_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_QUERYSETMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/RenderPipelineMock.h b/src/dawn/tests/unittests/native/mocks/RenderPipelineMock.h index 71e0287..c0cd457 100644 --- a/src/dawn/tests/unittests/native/mocks/RenderPipelineMock.h +++ b/src/dawn/tests/unittests/native/mocks/RenderPipelineMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINEMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINEMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/RenderPipeline.h" @@ -38,4 +38,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_RENDERPIPELINEMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/SamplerMock.h b/src/dawn/tests/unittests/native/mocks/SamplerMock.h index 48ab087..8f974f7 100644 --- a/src/dawn/tests/unittests/native/mocks/SamplerMock.h +++ b/src/dawn/tests/unittests/native/mocks/SamplerMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLER_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLER_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLERMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLERMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/Sampler.h" @@ -36,4 +36,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLER_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SAMPLERMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.h b/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.h index 8beeabf..d926fe1 100644 --- a/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.h +++ b/src/dawn/tests/unittests/native/mocks/ShaderModuleMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULEMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULEMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/Error.h" @@ -38,4 +38,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SHADERMODULEMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/SwapChainMock.h b/src/dawn/tests/unittests/native/mocks/SwapChainMock.h index 711f6ff..74c92fd 100644 --- a/src/dawn/tests/unittests/native/mocks/SwapChainMock.h +++ b/src/dawn/tests/unittests/native/mocks/SwapChainMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAIN_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAIN_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAINMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAINMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/SwapChain.h" @@ -43,4 +43,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAIN_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_SWAPCHAINMOCK_H_
diff --git a/src/dawn/tests/unittests/native/mocks/TextureMock.h b/src/dawn/tests/unittests/native/mocks/TextureMock.h index 10aa2e9..de39529 100644 --- a/src/dawn/tests/unittests/native/mocks/TextureMock.h +++ b/src/dawn/tests/unittests/native/mocks/TextureMock.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_NATIVE_MOCKS_TEXTURE_MOCK_H_ -#define TESTS_UNITTESTS_NATIVE_MOCKS_TEXTURE_MOCK_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_TEXTUREMOCK_H_ +#define SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_TEXTUREMOCK_H_ #include "dawn/native/Device.h" #include "dawn/native/Texture.h" @@ -46,4 +46,4 @@ } // namespace dawn::native -#endif // TESTS_UNITTESTS_NATIVE_MOCKS_TEXTURE_MOCK_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_NATIVE_MOCKS_TEXTUREMOCK_H_
diff --git a/src/dawn/tests/unittests/validation/ValidationTest.h b/src/dawn/tests/unittests/validation/ValidationTest.h index 989de41..0db5f53 100644 --- a/src/dawn/tests/unittests/validation/ValidationTest.h +++ b/src/dawn/tests/unittests/validation/ValidationTest.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_UNITTESTS_VALIDATIONTEST_H_ -#define TESTS_UNITTESTS_VALIDATIONTEST_H_ +#ifndef SRC_DAWN_TESTS_UNITTESTS_VALIDATION_VALIDATIONTEST_H_ +#define SRC_DAWN_TESTS_UNITTESTS_VALIDATION_VALIDATIONTEST_H_ #include "dawn/common/Log.h" #include "dawn/native/DawnNative.h" @@ -156,4 +156,4 @@ bool mExpectDestruction = false; }; -#endif // TESTS_UNITTESTS_VALIDATIONTEST_H_ +#endif // SRC_DAWN_TESTS_UNITTESTS_VALIDATION_VALIDATIONTEST_H_
diff --git a/src/dawn/tests/unittests/wire/WireTest.h b/src/dawn/tests/unittests/wire/WireTest.h index 235dcf5..f332db4 100644 --- a/src/dawn/tests/unittests/wire/WireTest.h +++ b/src/dawn/tests/unittests/wire/WireTest.h
@@ -12,6 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. +#ifndef SRC_DAWN_TESTS_UNITTESTS_WIRE_WIRETEST_H_ +#define SRC_DAWN_TESTS_UNITTESTS_WIRE_WIRETEST_H_ + #include "dawn/mock_webgpu.h" #include "gtest/gtest.h" @@ -148,3 +151,5 @@ std::unique_ptr<utils::TerribleCommandBuffer> mS2cBuf; std::unique_ptr<utils::TerribleCommandBuffer> mC2sBuf; }; + +#endif // SRC_DAWN_TESTS_UNITTESTS_WIRE_WIRETEST_H_
diff --git a/src/dawn/tests/white_box/VulkanImageWrappingTests.h b/src/dawn/tests/white_box/VulkanImageWrappingTests.h index d4173a7..49b9026 100644 --- a/src/dawn/tests/white_box/VulkanImageWrappingTests.h +++ b/src/dawn/tests/white_box/VulkanImageWrappingTests.h
@@ -12,8 +12,8 @@ // See the License for the specific language governing permissions and // limitations under the License. -#ifndef TESTS_VULKANIMAGEWRAPPINGTESTS_H_ -#define TESTS_VULKANIMAGEWRAPPINGTESTS_H_ +#ifndef SRC_DAWN_TESTS_WHITE_BOX_VULKANIMAGEWRAPPINGTESTS_H_ +#define SRC_DAWN_TESTS_WHITE_BOX_VULKANIMAGEWRAPPINGTESTS_H_ // This must be above all other includes otherwise VulkanBackend.h includes vulkan.h before we had // time to wrap it with vulkan_platform.h @@ -73,4 +73,4 @@ } // namespace dawn::native::vulkan -#endif // TESTS_VULKANIMAGEWRAPPINGTESTS_H_ +#endif // SRC_DAWN_TESTS_WHITE_BOX_VULKANIMAGEWRAPPINGTESTS_H_