Commit 57727c4e by Yuly Novikov Committed by Commit Bot

Further suppress tests failing on Ozone.

Since MipmapTest and Texture3DTestES2 fail in testSetUp(), it also needs to be skipped, in addition to the failing tests. Also suppress instantiation error for ES3-only QueryObjectTest Bug: angleproject:5725, angleproject:5728, angleproject:5704 Change-Id: Iac6549afd7609a2aee78bcfdb7c3de41886f3505 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2743920Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 92049513
...@@ -174,6 +174,9 @@ void main() ...@@ -174,6 +174,9 @@ void main()
void testSetUp() override void testSetUp() override
{ {
// http://anglebug.com/5725
ANGLE_SKIP_TEST_IF(IsOzone());
setUp2DProgram(); setUp2DProgram();
setUpCubeProgram(); setUpCubeProgram();
......
...@@ -141,17 +141,16 @@ TEST_P(QueryObjectTestES32, QueryObjectResultAfterEndPrimitivesGenerated) ...@@ -141,17 +141,16 @@ TEST_P(QueryObjectTestES32, QueryObjectResultAfterEndPrimitivesGenerated)
static const bool noErrorFlags[] = {true, false}; static const bool noErrorFlags[] = {true, false};
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(QueryObjectTest);
ANGLE_INSTANTIATE_TEST_COMBINE_1(QueryObjectTest, ANGLE_INSTANTIATE_TEST_COMBINE_1(QueryObjectTest,
PrintToStringParamName, PrintToStringParamName,
testing::ValuesIn(noErrorFlags), testing::ValuesIn(noErrorFlags),
ANGLE_ALL_TEST_PLATFORMS_ES3); ANGLE_ALL_TEST_PLATFORMS_ES3);
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(QueryObjectTestES32);
ANGLE_INSTANTIATE_TEST_COMBINE_1(QueryObjectTestES32, ANGLE_INSTANTIATE_TEST_COMBINE_1(QueryObjectTestES32,
PrintToStringParamName, PrintToStringParamName,
testing::ValuesIn(noErrorFlags), testing::ValuesIn(noErrorFlags),
ANGLE_ALL_TEST_PLATFORMS_ES32); ANGLE_ALL_TEST_PLATFORMS_ES32);
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(QueryObjectTestES32);
} // namespace angle } // namespace angle
...@@ -1118,6 +1118,9 @@ class Texture3DTestES2 : public TexCoordDrawTest ...@@ -1118,6 +1118,9 @@ class Texture3DTestES2 : public TexCoordDrawTest
void testSetUp() override void testSetUp() override
{ {
// http://anglebug.com/5728
ANGLE_SKIP_TEST_IF(IsOzone());
TexCoordDrawTest::testSetUp(); TexCoordDrawTest::testSetUp();
glGenTextures(1, &mTexture3D); glGenTextures(1, &mTexture3D);
......
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