Commit fd132e4e by Austin Sullivan Committed by Commit Bot

testing: Mark uninstantiated perftests

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: I13ffa09c4263a6dc8baf1749c3df5d2c54904e68 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2704800Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent 94607724
......@@ -250,3 +250,6 @@ ANGLE_INSTANTIATE_TEST(BlitFramebufferPerf,
D3D11(BufferType::DEPTH, 2),
D3D11(BufferType::STENCIL, 2),
D3D11(BufferType::DEPTH_STENCIL, 2));
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlitFramebufferPerf);
......@@ -172,4 +172,8 @@ TEST_P(DynamicPromotionPerfTest, Run)
}
ANGLE_INSTANTIATE_TEST(DynamicPromotionPerfTest, DynamicPromotionD3D11Params());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(DynamicPromotionPerfTest);
} // anonymous namespace
......@@ -219,4 +219,7 @@ TEST_P(IndexConversionPerfTest, Run)
ANGLE_INSTANTIATE_TEST(IndexConversionPerfTest,
IndexConversionPerfD3D11Params(),
IndexRangeOffsetPerfD3D11Params());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(IndexConversionPerfTest);
} // 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