Mark uninstantiated tests

This problem was discovered by attempting to roll googletest past CL 315255779, which 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: I17c7cae1121079219f632cbbcf8cfc65a27bfdb7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2691459Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Mark uninstantiated tests
a2fad5ea · Austin Sullivan · Commit Bot · e7496f51 · a2fad5ea · a2fad5ea
Commit a2fad5ea authored Feb 11, 2021 by Austin Sullivan Committed by Commit Bot Feb 13, 2021
Showing with 10 additions and 0 deletions

FloatingPointSurfaceTest.cpp src/tests/gl_tests/FloatingPointSurfaceTest.cpp +3 -0

MipmapTest.cpp src/tests/gl_tests/MipmapTest.cpp +4 -0

TransformFeedbackTest.cpp src/tests/gl_tests/TransformFeedbackTest.cpp +3 -0

No files found.
--- a/src/tests/gl_tests/FloatingPointSurfaceTest.cpp
+++ b/src/tests/gl_tests/FloatingPointSurfaceTest.cpp
@@ -70,3 +70,6 @@ ANGLE_INSTANTIATE_TEST(FloatingPointSurfaceTest,
                       ES2_D3D11(),
                       ES3_D3D11(),
                       ES2_D3D11_PRESENT_PATH_FAST());
+
+// This test suite is not instantiated on some OSes.
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FloatingPointSurfaceTest);
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -2054,6 +2054,10 @@ ANGLE_INSTANTIATE_TEST(MipmapTest, WithNoGenMultipleMipsPerPass(ES2_METAL()));
 ANGLE_INSTANTIATE_TEST(Mipmap3DBoxFilterTest,
                       ES2_METAL(),
                       WithNoGenMultipleMipsPerPass(ES2_METAL()));
+
+// This test suite is not instantiated on some OSes.
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Mipmap3DBoxFilterTest);
+
 }  // namespace extraPlatforms

 ANGLE_INSTANTIATE_TEST_ES3(MipmapTestES3);

--- a/src/tests/gl_tests/TransformFeedbackTest.cpp
+++ b/src/tests/gl_tests/TransformFeedbackTest.cpp
@@ -3014,4 +3014,7 @@ ANGLE_INSTANTIATE_TEST_ES32(TransformFeedbackTestES32);

 ANGLE_INSTANTIATE_TEST(TransformFeedbackWithDepthBufferTest, ES3_METAL());

+// This test suite is not instantiated on some OSes.
+GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackWithDepthBufferTest);
+
 }  // anonymous namespace