Commit f18b92ad by Austin Sullivan Committed by Commit Bot

testing: Mark uninstantiated GL & EGL test suites

googletest CL 315255779 causes test binaries to fail when they include test suites / parametrized tests that are not instantiated, and when they include empty test suites. This CL uses the GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST() macro to annotate the suites / tests that are causing test failures. This is necessary to get googletest rolled past CL 315255779. Bug: chromium:1163396 Change-Id: I05c0619186ffc265b8e32e8b69d6680a6acdbb48 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2701292Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
parent 21774731
...@@ -88,3 +88,6 @@ TEST_P(EGLAndroidFrameBufferTargetTest, MatchFramebufferTargetConfigs) ...@@ -88,3 +88,6 @@ TEST_P(EGLAndroidFrameBufferTargetTest, MatchFramebufferTargetConfigs)
} }
ANGLE_INSTANTIATE_TEST(EGLAndroidFrameBufferTargetTest, ES2_VULKAN(), ES3_VULKAN()); ANGLE_INSTANTIATE_TEST(EGLAndroidFrameBufferTargetTest, ES2_VULKAN(), ES3_VULKAN());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLAndroidFrameBufferTargetTest);
...@@ -2546,3 +2546,6 @@ ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationBlitFramebufferTest, ...@@ -2546,3 +2546,6 @@ ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationBlitFramebufferTest,
WithNoFixture(ES2_VULKAN()), WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES3_VULKAN()), WithNoFixture(ES3_VULKAN()),
WithNoFixture(ES3_VULKAN_SWIFTSHADER())); WithNoFixture(ES3_VULKAN_SWIFTSHADER()));
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationInterpolateAtOffsetTest);
...@@ -487,3 +487,6 @@ TEST_P(EGLPrintEGLinfoTest, PrintConfigInfo) ...@@ -487,3 +487,6 @@ TEST_P(EGLPrintEGLinfoTest, PrintConfigInfo)
} }
ANGLE_INSTANTIATE_TEST(EGLPrintEGLinfoTest, ES2_VULKAN(), ES3_VULKAN(), ES32_VULKAN()); ANGLE_INSTANTIATE_TEST(EGLPrintEGLinfoTest, ES2_VULKAN(), ES3_VULKAN(), ES32_VULKAN());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPrintEGLinfoTest);
...@@ -1321,3 +1321,6 @@ ANGLE_INSTANTIATE_TEST(EGLSurfaceTest3, WithNoFixture(ES3_VULKAN())); ...@@ -1321,3 +1321,6 @@ ANGLE_INSTANTIATE_TEST(EGLSurfaceTest3, WithNoFixture(ES3_VULKAN()));
#if defined(ANGLE_ENABLE_D3D11) #if defined(ANGLE_ENABLE_D3D11)
ANGLE_INSTANTIATE_TEST(EGLSurfaceTestD3D11, WithNoFixture(ES2_D3D11()), WithNoFixture(ES3_D3D11())); ANGLE_INSTANTIATE_TEST(EGLSurfaceTestD3D11, WithNoFixture(ES2_D3D11()), WithNoFixture(ES3_D3D11()));
#endif #endif
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLSurfaceTest3);
...@@ -2499,4 +2499,7 @@ ANGLE_INSTANTIATE_TEST(ClearTestRGB, ...@@ -2499,4 +2499,7 @@ ANGLE_INSTANTIATE_TEST(ClearTestRGB,
ES2_METAL(), ES2_METAL(),
ES3_METAL()); ES3_METAL());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VulkanClearTest);
} // anonymous namespace } // anonymous namespace
...@@ -1754,4 +1754,5 @@ ANGLE_INSTANTIATE_TEST_ES3(D3DTextureTestES3); ...@@ -1754,4 +1754,5 @@ ANGLE_INSTANTIATE_TEST_ES3(D3DTextureTestES3);
ANGLE_INSTANTIATE_TEST_ES3(D3DTextureYUVTestES3); ANGLE_INSTANTIATE_TEST_ES3(D3DTextureYUVTestES3);
// D3D Debug device reports an error. http://anglebug.com/3513 // D3D Debug device reports an error. http://anglebug.com/3513
// ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11()); // ANGLE_INSTANTIATE_TEST(D3DTextureTestMS, ES2_D3D11());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(D3DTextureTestMS);
} // namespace angle } // namespace angle
...@@ -412,4 +412,8 @@ TEST_P(GetImageTest, GetTexImageAlpha) ...@@ -412,4 +412,8 @@ TEST_P(GetImageTest, GetTexImageAlpha)
ANGLE_INSTANTIATE_TEST(GetImageTest, ES2_VULKAN(), ES3_VULKAN()); ANGLE_INSTANTIATE_TEST(GetImageTest, ES2_VULKAN(), ES3_VULKAN());
ANGLE_INSTANTIATE_TEST(GetImageTestNoExtensions, ES2_VULKAN(), ES3_VULKAN()); ANGLE_INSTANTIATE_TEST(GetImageTestNoExtensions, ES2_VULKAN(), ES3_VULKAN());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GetImageTestNoExtensions);
} // namespace } // namespace
\ No newline at end of file
...@@ -285,3 +285,6 @@ TEST_P(MaxTextureSizeTest, RenderToTexture) ...@@ -285,3 +285,6 @@ TEST_P(MaxTextureSizeTest, RenderToTexture)
// Use this to select which configurations (e.g. which renderer, which GLES major version) these // Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against. // tests should be run against.
ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest, ES2_D3D9(), ES2_D3D11(), ES2_VULKAN()); ANGLE_INSTANTIATE_TEST(MaxTextureSizeTest, ES2_D3D9(), ES2_D3D11(), ES2_VULKAN());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MaxTextureSizeTest);
...@@ -2326,3 +2326,6 @@ ANGLE_INSTANTIATE_TEST(MultiviewLayeredRenderTest, ...@@ -2326,3 +2326,6 @@ ANGLE_INSTANTIATE_TEST(MultiviewLayeredRenderTest,
GeomShaderD3D11(ExtensionName::multiview), GeomShaderD3D11(ExtensionName::multiview),
VertexShaderOpenGL(ExtensionName::multiview2), VertexShaderOpenGL(ExtensionName::multiview2),
GeomShaderD3D11(ExtensionName::multiview2)); GeomShaderD3D11(ExtensionName::multiview2));
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewDrawValidationTest);
\ No newline at end of file
...@@ -1364,3 +1364,6 @@ ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms, ...@@ -1364,3 +1364,6 @@ ANGLE_INSTANTIATE_TEST(ProgramBinariesAcrossPlatforms,
PlatformsWithLinkResult(ES3_VULKAN(), ES31_VULKAN(), false ), // Switching to newer client version shouldn't work with Vulkan PlatformsWithLinkResult(ES3_VULKAN(), ES31_VULKAN(), false ), // Switching to newer client version shouldn't work with Vulkan
); );
// clang-format on // clang-format on
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ProgramBinariesAcrossPlatforms);
\ No newline at end of file
...@@ -3014,7 +3014,8 @@ ANGLE_INSTANTIATE_TEST_ES32(TransformFeedbackTestES32); ...@@ -3014,7 +3014,8 @@ ANGLE_INSTANTIATE_TEST_ES32(TransformFeedbackTestES32);
ANGLE_INSTANTIATE_TEST(TransformFeedbackWithDepthBufferTest, ES3_METAL()); ANGLE_INSTANTIATE_TEST(TransformFeedbackWithDepthBufferTest, ES3_METAL());
// This test suite is not instantiated on some OSes. // These test suites are not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackTestES32);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackWithDepthBufferTest); GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackWithDepthBufferTest);
} // anonymous namespace } // anonymous namespace
...@@ -393,4 +393,7 @@ ANGLE_INSTANTIATE_TEST(ViewportTest, ...@@ -393,4 +393,7 @@ ANGLE_INSTANTIATE_TEST(ViewportTest,
ES3_OPENGLES(), ES3_OPENGLES(),
ES2_VULKAN()); ES2_VULKAN());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ViewportTest);
} // namespace } // namespace
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment