From e30d5e17e4c45d7c792cfb2a13666b7bfc133fc1 Mon Sep 17 00:00:00 2001 From: Corentin Wallez Date: Thu, 21 Feb 2019 14:57:01 +0000 Subject: [PATCH] Require a semicolon at the end of DAWN_INSTANTIATE_TEST TBR=kainino@chromium.org BUG=chromium:926235 Change-Id: I67d8c594cd8dc060482e16de39b1996e01e9b44f Reviewed-on: https://dawn-review.googlesource.com/c/4960 Reviewed-by: Corentin Wallez Reviewed-by: Nico Weber Commit-Queue: Corentin Wallez --- src/tests/DawnTest.h | 2 +- src/tests/end2end/BasicTests.cpp | 2 +- src/tests/end2end/BindGroupTests.cpp | 2 +- src/tests/end2end/BufferTests.cpp | 6 +++--- src/tests/end2end/ColorStateTests.cpp | 2 +- src/tests/end2end/ComputeCopyStorageBufferTests.cpp | 2 +- src/tests/end2end/CopyTests.cpp | 4 ++-- src/tests/end2end/DebugMarkerTests.cpp | 2 +- src/tests/end2end/DepthStencilStateTests.cpp | 2 +- src/tests/end2end/DrawIndexedTests.cpp | 2 +- src/tests/end2end/DrawTests.cpp | 2 +- src/tests/end2end/FenceTests.cpp | 2 +- src/tests/end2end/IndexFormatTests.cpp | 2 +- src/tests/end2end/InputStateTests.cpp | 2 +- src/tests/end2end/PrimitiveTopologyTests.cpp | 2 +- src/tests/end2end/PushConstantTests.cpp | 2 +- src/tests/end2end/RenderPassLoadOpTests.cpp | 2 +- src/tests/end2end/RenderPassTests.cpp | 2 +- src/tests/end2end/SamplerTests.cpp | 2 +- src/tests/end2end/ScissorTests.cpp | 2 +- src/tests/end2end/TextureViewTests.cpp | 4 ++-- src/tests/end2end/ViewportOrientationTests.cpp | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/tests/DawnTest.h b/src/tests/DawnTest.h index 8c28e23e47..615ef60eaa 100644 --- a/src/tests/DawnTest.h +++ b/src/tests/DawnTest.h @@ -192,7 +192,7 @@ class DawnTest : public ::testing::TestWithParam { , testName, \ testing::ValuesIn(::detail::FilterBackends( \ testName##params, sizeof(testName##params) / sizeof(firstParam))), \ - ::detail::GetParamName); + ::detail::GetParamName) // Skip a test when the given condition is satisfied. #define DAWN_SKIP_TEST_IF(condition) \ diff --git a/src/tests/end2end/BasicTests.cpp b/src/tests/end2end/BasicTests.cpp index e0474746b1..83d0967cef 100644 --- a/src/tests/end2end/BasicTests.cpp +++ b/src/tests/end2end/BasicTests.cpp @@ -33,4 +33,4 @@ TEST_P(BasicTests, BufferSetSubData) { EXPECT_BUFFER_U8_EQ(value, buffer, 0); } -DAWN_INSTANTIATE_TEST(BasicTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(BasicTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/BindGroupTests.cpp b/src/tests/end2end/BindGroupTests.cpp index 68781b8dd2..c11b3db7f1 100644 --- a/src/tests/end2end/BindGroupTests.cpp +++ b/src/tests/end2end/BindGroupTests.cpp @@ -467,4 +467,4 @@ TEST_P(BindGroupTests, DrawTwiceInSamePipelineWithFourBindGroupSets) EXPECT_PIXEL_RGBA8_EQ(notFilled, renderPass.color, max, max); } -DAWN_INSTANTIATE_TEST(BindGroupTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(BindGroupTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/BufferTests.cpp b/src/tests/end2end/BufferTests.cpp index 91e104ad08..2a1ab2488d 100644 --- a/src/tests/end2end/BufferTests.cpp +++ b/src/tests/end2end/BufferTests.cpp @@ -81,7 +81,7 @@ TEST_P(BufferMapReadTests, LargeRead) { buffer.Unmap(); } -DAWN_INSTANTIATE_TEST(BufferMapReadTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(BufferMapReadTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); class BufferMapWriteTests : public DawnTest { protected: @@ -146,7 +146,7 @@ TEST_P(BufferMapWriteTests, LargeWrite) { EXPECT_BUFFER_U32_RANGE_EQ(myData.data(), buffer, 0, kDataSize); } -DAWN_INSTANTIATE_TEST(BufferMapWriteTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(BufferMapWriteTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); class BufferSetSubDataTests : public DawnTest { }; @@ -228,4 +228,4 @@ DAWN_INSTANTIATE_TEST(BufferSetSubDataTests, D3D12Backend, MetalBackend, OpenGLBackend, - VulkanBackend) + VulkanBackend); diff --git a/src/tests/end2end/ColorStateTests.cpp b/src/tests/end2end/ColorStateTests.cpp index 290cfe0793..bceeaf8950 100644 --- a/src/tests/end2end/ColorStateTests.cpp +++ b/src/tests/end2end/ColorStateTests.cpp @@ -1011,4 +1011,4 @@ TEST_P(ColorStateTest, DefaultBlendColor) { } } -DAWN_INSTANTIATE_TEST(ColorStateTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(ColorStateTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp index a2af907d4e..5d11f2d3ec 100644 --- a/src/tests/end2end/ComputeCopyStorageBufferTests.cpp +++ b/src/tests/end2end/ComputeCopyStorageBufferTests.cpp @@ -191,4 +191,4 @@ DAWN_INSTANTIATE_TEST(ComputeCopyStorageBufferTests, D3D12Backend, MetalBackend, OpenGLBackend, - VulkanBackend) + VulkanBackend); diff --git a/src/tests/end2end/CopyTests.cpp b/src/tests/end2end/CopyTests.cpp index 15d08f731a..6f2a243ff2 100644 --- a/src/tests/end2end/CopyTests.cpp +++ b/src/tests/end2end/CopyTests.cpp @@ -407,7 +407,7 @@ TEST_P(CopyTests_T2B, Texture2DArrayMip) { } } -DAWN_INSTANTIATE_TEST(CopyTests_T2B, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(CopyTests_T2B, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); // Test that copying an entire texture with 256-byte aligned dimensions works TEST_P(CopyTests_B2T, FullTextureAligned) { @@ -550,4 +550,4 @@ TEST_P(CopyTests_B2T, RowPitchUnaligned) { } } -DAWN_INSTANTIATE_TEST(CopyTests_B2T, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(CopyTests_B2T, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/DebugMarkerTests.cpp b/src/tests/end2end/DebugMarkerTests.cpp index 1a7f6e42dd..d38a2739b8 100644 --- a/src/tests/end2end/DebugMarkerTests.cpp +++ b/src/tests/end2end/DebugMarkerTests.cpp @@ -35,4 +35,4 @@ TEST_P(DebugMarkerTests, NoFailureWithoutDebugToolAttached) { queue.Submit(1, &commands); } -DAWN_INSTANTIATE_TEST(DebugMarkerTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(DebugMarkerTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/DepthStencilStateTests.cpp b/src/tests/end2end/DepthStencilStateTests.cpp index 7495310b6d..6fcdf08048 100644 --- a/src/tests/end2end/DepthStencilStateTests.cpp +++ b/src/tests/end2end/DepthStencilStateTests.cpp @@ -703,4 +703,4 @@ DAWN_INSTANTIATE_TEST(DepthStencilStateTest, D3D12Backend, MetalBackend, OpenGLBackend, - VulkanBackend) + VulkanBackend); diff --git a/src/tests/end2end/DrawIndexedTests.cpp b/src/tests/end2end/DrawIndexedTests.cpp index 9324226288..821be2e8da 100644 --- a/src/tests/end2end/DrawIndexedTests.cpp +++ b/src/tests/end2end/DrawIndexedTests.cpp @@ -143,4 +143,4 @@ TEST_P(DrawIndexedTest, BaseVertex) { Test(3, 1, 3, 4, 0, filled, notFilled); } -DAWN_INSTANTIATE_TEST(DrawIndexedTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(DrawIndexedTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/DrawTests.cpp b/src/tests/end2end/DrawTests.cpp index 48a83113c3..0a719b15cd 100644 --- a/src/tests/end2end/DrawTests.cpp +++ b/src/tests/end2end/DrawTests.cpp @@ -118,4 +118,4 @@ TEST_P(DrawTest, Uint32) { Test(6, 1, 0, 0, filled, filled); } -DAWN_INSTANTIATE_TEST(DrawTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(DrawTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/FenceTests.cpp b/src/tests/end2end/FenceTests.cpp index 8fdba65e51..9e6d484c41 100644 --- a/src/tests/end2end/FenceTests.cpp +++ b/src/tests/end2end/FenceTests.cpp @@ -224,4 +224,4 @@ TEST_P(FenceTests, DISABLED_DestroyBeforeOnCompletionEnd) { WaitForCompletedValue(fence, 1); } -DAWN_INSTANTIATE_TEST(FenceTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(FenceTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/IndexFormatTests.cpp b/src/tests/end2end/IndexFormatTests.cpp index 6b26a1ea7c..1e4e441d71 100644 --- a/src/tests/end2end/IndexFormatTests.cpp +++ b/src/tests/end2end/IndexFormatTests.cpp @@ -290,4 +290,4 @@ TEST_P(IndexFormatTest, DISABLED_SetIndexBufferBeforeSetPipeline) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(0, 255, 0, 255), renderPass.color, 100, 300); } -DAWN_INSTANTIATE_TEST(IndexFormatTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(IndexFormatTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/InputStateTests.cpp b/src/tests/end2end/InputStateTests.cpp index d2367a4d37..20cb9231c2 100644 --- a/src/tests/end2end/InputStateTests.cpp +++ b/src/tests/end2end/InputStateTests.cpp @@ -519,7 +519,7 @@ TEST_P(InputStateTest, MultiplePipelinesMixedInputState) { CheckResult(1, 4); } -DAWN_INSTANTIATE_TEST(InputStateTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(InputStateTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); // TODO for the input state: // - Add more vertex formats diff --git a/src/tests/end2end/PrimitiveTopologyTests.cpp b/src/tests/end2end/PrimitiveTopologyTests.cpp index bff56447a7..f0562c6c3b 100644 --- a/src/tests/end2end/PrimitiveTopologyTests.cpp +++ b/src/tests/end2end/PrimitiveTopologyTests.cpp @@ -296,4 +296,4 @@ TEST_P(PrimitiveTopologyTest, TriangleStrip) { }); } -DAWN_INSTANTIATE_TEST(PrimitiveTopologyTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(PrimitiveTopologyTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/PushConstantTests.cpp b/src/tests/end2end/PushConstantTests.cpp index a9e4842b18..b183c3a3ca 100644 --- a/src/tests/end2end/PushConstantTests.cpp +++ b/src/tests/end2end/PushConstantTests.cpp @@ -416,4 +416,4 @@ TEST_P(PushConstantTest, SimultaneousVertexAndFragmentConstants) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(1, 1, 0, 0), renderPass.color, 0, 0); } -DAWN_INSTANTIATE_TEST(PushConstantTest, MetalBackend, OpenGLBackend) +DAWN_INSTANTIATE_TEST(PushConstantTest, MetalBackend, OpenGLBackend); diff --git a/src/tests/end2end/RenderPassLoadOpTests.cpp b/src/tests/end2end/RenderPassLoadOpTests.cpp index 4ae191d2c7..d70812db24 100644 --- a/src/tests/end2end/RenderPassLoadOpTests.cpp +++ b/src/tests/end2end/RenderPassLoadOpTests.cpp @@ -169,4 +169,4 @@ TEST_P(RenderPassLoadOpTests, ColorClearThenLoadAndDraw) { EXPECT_TEXTURE_RGBA8_EQ(expectBlue.data(), renderTarget, kRTSize / 2, 0, kRTSize / 2, kRTSize, 0, 0); } -DAWN_INSTANTIATE_TEST(RenderPassLoadOpTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(RenderPassLoadOpTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/RenderPassTests.cpp b/src/tests/end2end/RenderPassTests.cpp index c406c83f64..9abf251e97 100644 --- a/src/tests/end2end/RenderPassTests.cpp +++ b/src/tests/end2end/RenderPassTests.cpp @@ -128,4 +128,4 @@ TEST_P(RenderPassTest, TwoRenderPassesInOneCommandBuffer) { EXPECT_PIXEL_RGBA8_EQ(kGreen, renderTarget2, kRTSize - 1, 1); } -DAWN_INSTANTIATE_TEST(RenderPassTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(RenderPassTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/SamplerTests.cpp b/src/tests/end2end/SamplerTests.cpp index 7c483e58c1..f6baecdfaa 100644 --- a/src/tests/end2end/SamplerTests.cpp +++ b/src/tests/end2end/SamplerTests.cpp @@ -184,4 +184,4 @@ TEST_P(SamplerTest, AddressMode) { } } -DAWN_INSTANTIATE_TEST(SamplerTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(SamplerTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/ScissorTests.cpp b/src/tests/end2end/ScissorTests.cpp index 65f80ed01a..0c5f8f7f63 100644 --- a/src/tests/end2end/ScissorTests.cpp +++ b/src/tests/end2end/ScissorTests.cpp @@ -176,4 +176,4 @@ TEST_P(ScissorTest, NoInheritanceBetweenRenderPass) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(0, 255, 0, 255), renderPass.color, 99, 99); } -DAWN_INSTANTIATE_TEST(ScissorTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(ScissorTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/TextureViewTests.cpp b/src/tests/end2end/TextureViewTests.cpp index 7e1dfdd166..aec50ee130 100644 --- a/src/tests/end2end/TextureViewTests.cpp +++ b/src/tests/end2end/TextureViewTests.cpp @@ -631,6 +631,6 @@ TEST_P(TextureViewRenderingTest, Texture2DArrayViewOnALayerOf2DArrayTextureAsCol } } -DAWN_INSTANTIATE_TEST(TextureViewSamplingTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(TextureViewSamplingTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); -DAWN_INSTANTIATE_TEST(TextureViewRenderingTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(TextureViewRenderingTest, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend); diff --git a/src/tests/end2end/ViewportOrientationTests.cpp b/src/tests/end2end/ViewportOrientationTests.cpp index ee4905829a..f1f3295f8d 100644 --- a/src/tests/end2end/ViewportOrientationTests.cpp +++ b/src/tests/end2end/ViewportOrientationTests.cpp @@ -61,4 +61,4 @@ TEST_P(ViewportOrientationTests, OriginAt0x0) { EXPECT_PIXEL_RGBA8_EQ(RGBA8(0, 0, 0, 0), renderPass.color, 1, 1); } -DAWN_INSTANTIATE_TEST(ViewportOrientationTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend) +DAWN_INSTANTIATE_TEST(ViewportOrientationTests, D3D12Backend, MetalBackend, OpenGLBackend, VulkanBackend);