Commit a2fad5ea by Austin Sullivan Committed by Commit Bot

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: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
parent e7496f51
...@@ -70,3 +70,6 @@ ANGLE_INSTANTIATE_TEST(FloatingPointSurfaceTest, ...@@ -70,3 +70,6 @@ ANGLE_INSTANTIATE_TEST(FloatingPointSurfaceTest,
ES2_D3D11(), ES2_D3D11(),
ES3_D3D11(), ES3_D3D11(),
ES2_D3D11_PRESENT_PATH_FAST()); ES2_D3D11_PRESENT_PATH_FAST());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FloatingPointSurfaceTest);
...@@ -2054,6 +2054,10 @@ ANGLE_INSTANTIATE_TEST(MipmapTest, WithNoGenMultipleMipsPerPass(ES2_METAL())); ...@@ -2054,6 +2054,10 @@ ANGLE_INSTANTIATE_TEST(MipmapTest, WithNoGenMultipleMipsPerPass(ES2_METAL()));
ANGLE_INSTANTIATE_TEST(Mipmap3DBoxFilterTest, ANGLE_INSTANTIATE_TEST(Mipmap3DBoxFilterTest,
ES2_METAL(), ES2_METAL(),
WithNoGenMultipleMipsPerPass(ES2_METAL())); WithNoGenMultipleMipsPerPass(ES2_METAL()));
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(Mipmap3DBoxFilterTest);
} // namespace extraPlatforms } // namespace extraPlatforms
ANGLE_INSTANTIATE_TEST_ES3(MipmapTestES3); ANGLE_INSTANTIATE_TEST_ES3(MipmapTestES3);
......
...@@ -3014,4 +3014,7 @@ ANGLE_INSTANTIATE_TEST_ES32(TransformFeedbackTestES32); ...@@ -3014,4 +3014,7 @@ 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.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TransformFeedbackWithDepthBufferTest);
} // anonymous namespace } // anonymous 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