diff --git a/engine/src/flutter/impeller/aiks/aiks_blur_unittests.cc b/engine/src/flutter/impeller/aiks/aiks_blur_unittests.cc index 92d8a95ee2..95d7b1d10f 100644 --- a/engine/src/flutter/impeller/aiks/aiks_blur_unittests.cc +++ b/engine/src/flutter/impeller/aiks/aiks_blur_unittests.cc @@ -502,14 +502,14 @@ TEST_P(AiksTest, GaussianBlurAtPeripheryHorizontal) { TEST_P(AiksTest, GaussianBlurWithoutDecalSupport) { if (GetParam() != PlaygroundBackend::kMetal) { - GTEST_SKIP_( - "This backend doesn't yet support setting device capabilities."); + GTEST_SKIP() + << "This backend doesn't yet support setting device capabilities."; } if (!WillRenderSomething()) { // Sometimes these tests are run without playgrounds enabled which is // pointless for this test since we are asserting that // `SupportsDecalSamplerAddressMode` is called. - GTEST_SKIP_("This test requires playgrounds."); + GTEST_SKIP() << "This test requires playgrounds."; } std::shared_ptr old_capabilities = diff --git a/engine/src/flutter/impeller/compiler/compiler_unittests.cc b/engine/src/flutter/impeller/compiler/compiler_unittests.cc index 87e1344cdb..afea65674c 100644 --- a/engine/src/flutter/impeller/compiler/compiler_unittests.cc +++ b/engine/src/flutter/impeller/compiler/compiler_unittests.cc @@ -55,7 +55,8 @@ TEST_P(CompilerTest, CanCompileHLSLWithMultipleStages) { TEST_P(CompilerTest, CanCompileComputeShader) { if (!TargetPlatformIsMetal(GetParam())) { - GTEST_SKIP_("Only enabled on Metal backends till ES 3.2 support is added."); + GTEST_SKIP() + << "Only enabled on Metal backends till ES 3.2 support is added."; } ASSERT_TRUE(CanCompileAndReflect("sample.comp")); ASSERT_TRUE(CanCompileAndReflect("sample.comp", SourceType::kComputeShader)); diff --git a/engine/src/flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc b/engine/src/flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc index 674ac4fdac..36e21d644c 100644 --- a/engine/src/flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc +++ b/engine/src/flutter/impeller/entity/contents/tiled_texture_contents_unittests.cc @@ -56,8 +56,8 @@ TEST_P(EntityTest, TiledTextureContentsRendersWithCorrectPipeline) { #if !defined(FML_OS_MACOSX) TEST_P(EntityTest, TiledTextureContentsRendersWithCorrectPipelineExternalOES) { if (GetParam() != PlaygroundBackend::kOpenGLES) { - GTEST_SKIP_( - "External OES textures are only valid for the OpenGLES backend."); + GTEST_SKIP() + << "External OES textures are only valid for the OpenGLES backend."; } TextureDescriptor texture_desc; diff --git a/engine/src/flutter/impeller/entity/entity_unittests.cc b/engine/src/flutter/impeller/entity/entity_unittests.cc index 9631dbee52..7f476eb528 100644 --- a/engine/src/flutter/impeller/entity/entity_unittests.cc +++ b/engine/src/flutter/impeller/entity/entity_unittests.cc @@ -1916,7 +1916,8 @@ static std::vector> CreateTestYUVTextures( TEST_P(EntityTest, YUVToRGBFilter) { if (GetParam() == PlaygroundBackend::kOpenGLES) { // TODO(114588) : Support YUV to RGB filter on OpenGLES backend. - GTEST_SKIP_("YUV to RGB filter is not supported on OpenGLES backend yet."); + GTEST_SKIP() + << "YUV to RGB filter is not supported on OpenGLES backend yet."; } auto callback = [&](ContentContext& context, RenderPass& pass) -> bool { diff --git a/engine/src/flutter/impeller/golden_tests/golden_playground_test_mac.cc b/engine/src/flutter/impeller/golden_tests/golden_playground_test_mac.cc index d5cb282c4b..75a1556184 100644 --- a/engine/src/flutter/impeller/golden_tests/golden_playground_test_mac.cc +++ b/engine/src/flutter/impeller/golden_tests/golden_playground_test_mac.cc @@ -210,15 +210,15 @@ void GoldenPlaygroundTest::SetUp() { switch (GetParam()) { case PlaygroundBackend::kMetal: if (!DoesSupportWideGamutTests()) { - GTEST_SKIP_( - "This metal device doesn't support wide gamut golden tests."); + GTEST_SKIP() + << "This metal device doesn't support wide gamut golden tests."; } pimpl_->screenshotter = std::make_unique(enable_wide_gamut); break; case PlaygroundBackend::kVulkan: { if (enable_wide_gamut) { - GTEST_SKIP_("Vulkan doesn't support wide gamut golden tests."); + GTEST_SKIP() << "Vulkan doesn't support wide gamut golden tests."; } const std::unique_ptr& playground = GetSharedVulkanPlayground(/*enable_validations=*/true); @@ -228,7 +228,7 @@ void GoldenPlaygroundTest::SetUp() { } case PlaygroundBackend::kOpenGLES: { if (enable_wide_gamut) { - GTEST_SKIP_("OpenGLES doesn't support wide gamut golden tests."); + GTEST_SKIP() << "OpenGLES doesn't support wide gamut golden tests."; } FML_CHECK(::glfwInit() == GLFW_TRUE); PlaygroundSwitches playground_switches; @@ -243,9 +243,9 @@ void GoldenPlaygroundTest::SetUp() { if (std::find(kSkipTests.begin(), kSkipTests.end(), test_name) != kSkipTests.end()) { - GTEST_SKIP_( - "GoldenPlaygroundTest doesn't support interactive playground tests " - "yet."); + GTEST_SKIP() + << "GoldenPlaygroundTest doesn't support interactive playground tests " + "yet."; } testing::GoldenDigest::Instance()->AddDimension( diff --git a/engine/src/flutter/impeller/golden_tests/golden_playground_test_stub.cc b/engine/src/flutter/impeller/golden_tests/golden_playground_test_stub.cc index 0d6b817470..58f1951b87 100644 --- a/engine/src/flutter/impeller/golden_tests/golden_playground_test_stub.cc +++ b/engine/src/flutter/impeller/golden_tests/golden_playground_test_stub.cc @@ -20,7 +20,7 @@ void GoldenPlaygroundTest::SetTypographerContext( void GoldenPlaygroundTest::TearDown() {} void GoldenPlaygroundTest::SetUp() { - GTEST_SKIP_("GoldenPlaygroundTest doesn't support this backend type."); + GTEST_SKIP() << "GoldenPlaygroundTest doesn't support this backend type."; } PlaygroundBackend GoldenPlaygroundTest::GetBackend() const { diff --git a/engine/src/flutter/impeller/playground/compute_playground_test.cc b/engine/src/flutter/impeller/playground/compute_playground_test.cc index 1abea913eb..1848e01bc3 100644 --- a/engine/src/flutter/impeller/playground/compute_playground_test.cc +++ b/engine/src/flutter/impeller/playground/compute_playground_test.cc @@ -16,12 +16,12 @@ ComputePlaygroundTest::~ComputePlaygroundTest() = default; void ComputePlaygroundTest::SetUp() { if (!Playground::SupportsBackend(GetParam())) { - GTEST_SKIP_("Playground doesn't support this backend type."); + GTEST_SKIP() << "Playground doesn't support this backend type."; return; } if (!Playground::ShouldOpenNewPlaygrounds()) { - GTEST_SKIP_("Skipping due to user action."); + GTEST_SKIP() << "Skipping due to user action."; return; } diff --git a/engine/src/flutter/impeller/playground/playground_test.cc b/engine/src/flutter/impeller/playground/playground_test.cc index 45f9599acc..ce9cf9241b 100644 --- a/engine/src/flutter/impeller/playground/playground_test.cc +++ b/engine/src/flutter/impeller/playground/playground_test.cc @@ -27,12 +27,12 @@ bool DoesSupportWideGamutTests() { void PlaygroundTest::SetUp() { if (!Playground::SupportsBackend(GetParam())) { - GTEST_SKIP_("Playground doesn't support this backend type."); + GTEST_SKIP() << "Playground doesn't support this backend type."; return; } if (!Playground::ShouldOpenNewPlaygrounds()) { - GTEST_SKIP_("Skipping due to user action."); + GTEST_SKIP() << "Skipping due to user action."; return; } @@ -46,7 +46,7 @@ void PlaygroundTest::SetUp() { if (switches.enable_wide_gamut && (GetParam() != PlaygroundBackend::kMetal || !DoesSupportWideGamutTests())) { - GTEST_SKIP_("This backend doesn't yet support wide gamut."); + GTEST_SKIP() << "This backend doesn't yet support wide gamut."; return; } diff --git a/engine/src/flutter/impeller/renderer/renderer_unittests.cc b/engine/src/flutter/impeller/renderer/renderer_unittests.cc index 16c7943274..c97fd05f5b 100644 --- a/engine/src/flutter/impeller/renderer/renderer_unittests.cc +++ b/engine/src/flutter/impeller/renderer/renderer_unittests.cc @@ -440,7 +440,7 @@ TEST_P(RendererTest, CanRenderToTexture) { TEST_P(RendererTest, CanRenderInstanced) { if (GetParam() == PlaygroundBackend::kOpenGLES) { - GTEST_SKIP_("Instancing is not supported on OpenGL."); + GTEST_SKIP() << "Instancing is not supported on OpenGL."; } using VS = InstancedDrawVertexShader; using FS = InstancedDrawFragmentShader; @@ -1403,8 +1403,8 @@ TEST_P(RendererTest, CanSepiaToneWithSubpasses) { ASSERT_TRUE(context); if (!context->GetCapabilities()->SupportsFramebufferFetch()) { - GTEST_SKIP_( - "This test uses framebuffer fetch and the backend doesn't support it."); + GTEST_SKIP() << "This test uses framebuffer fetch and the backend doesn't " + "support it."; return; } @@ -1494,8 +1494,8 @@ TEST_P(RendererTest, CanSepiaToneThenSwizzleWithSubpasses) { ASSERT_TRUE(context); if (!context->GetCapabilities()->SupportsFramebufferFetch()) { - GTEST_SKIP_( - "This test uses framebuffer fetch and the backend doesn't support it."); + GTEST_SKIP() << "This test uses framebuffer fetch and the backend doesn't " + "support it."; return; } diff --git a/engine/src/flutter/impeller/scene/scene_unittests.cc b/engine/src/flutter/impeller/scene/scene_unittests.cc index 0bb8597f2b..ccfd51d4ac 100644 --- a/engine/src/flutter/impeller/scene/scene_unittests.cc +++ b/engine/src/flutter/impeller/scene/scene_unittests.cc @@ -112,7 +112,7 @@ TEST_P(SceneTest, FlutterLogo) { TEST_P(SceneTest, TwoTriangles) { if (GetBackend() == PlaygroundBackend::kVulkan) { - GTEST_SKIP_("Temporarily disabled."); + GTEST_SKIP() << "Temporarily disabled."; } auto allocator = GetContext()->GetResourceAllocator();