Skip to content

A
angle
Commit c03a4235 by Yuly Novikov Committed by Commit Bot
Options

Suppress UNINSTANTIATED_PARAMETERIZED_TEST failures on Nexus 5X

GTest complains that we don't run some tests on GLES backend. Bug: chromium:1180570 Change-Id: I9427ac25c3b6f06f3c042caa3c0afc7000cf1599 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2710783Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 5c931b61
Showing with 53 additions and 15 deletions
src/tests/egl_tests/EGLContextASANTest.cpp
......@@ -195,6 +195,7 @@ TEST_P(EGLContextASANTest, DestroyContextInUse)
}
} // anonymous namespace
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLContextASANTest);
ANGLE_INSTANTIATE_TEST(EGLContextASANTest,
ES2_D3D9(),
ES2_D3D11(),
......
src/tests/egl_tests/EGLContextSharingTest.cpp
......@@ -592,6 +592,7 @@ TEST_P(EGLContextSharingTest, DeleteReaderOfSharedTexture)
}
} // anonymous namespace
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLContextSharingTest);
ANGLE_INSTANTIATE_TEST(EGLContextSharingTest,
ES2_D3D9(),
ES2_D3D11(),
......
src/tests/egl_tests/EGLCreateContextAttribsTest.cpp
......@@ -158,6 +158,7 @@ TEST_P(EGLCreateContextAttribsTest, IncompatibleConfig)
eglTerminate(mDisplay);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLCreateContextAttribsTest);
ANGLE_INSTANTIATE_TEST(EGLCreateContextAttribsTest,
WithNoFixture(ES2_D3D9()),
WithNoFixture(ES2_D3D11()),
......
src/tests/egl_tests/EGLDebugTest.cpp
......@@ -179,6 +179,7 @@ TEST_P(EGLDebugTest, SetLabel)
EXPECT_EGL_ERROR(EGL_BAD_PARAMETER);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLDebugTest);
ANGLE_INSTANTIATE_TEST(EGLDebugTest,
ES2_D3D9(),
ES2_D3D11(),
......
src/tests/egl_tests/EGLNoConfigContextTest.cpp
......@@ -127,6 +127,7 @@ TEST_P(EGLNoConfigContextTest, RenderCheck)
}
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLNoConfigContextTest);
ANGLE_INSTANTIATE_TEST(EGLNoConfigContextTest,
WithNoFixture(ES2_OPENGL()),
WithNoFixture(ES2_VULKAN()),
......
src/tests/egl_tests/EGLPreRotationTest.cpp
......@@ -2524,28 +2524,32 @@ TEST_P(EGLPreRotationInterpolateAtOffsetTest, InterpolateAtOffsetWithCustomFBO)
# undef Bool
#endif
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationInterpolateAtOffsetTest);
ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationInterpolateAtOffsetTest,
PrintToStringParamName,
testing::Bool(),
WithNoFixture(ES31_VULKAN()));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationSurfaceTest);
ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationSurfaceTest,
PrintToStringParamName,
testing::Bool(),
WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES3_VULKAN()),
WithNoFixture(ES3_VULKAN_SWIFTSHADER()));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationLargeSurfaceTest);
ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationLargeSurfaceTest,
PrintToStringParamName,
testing::Bool(),
WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES3_VULKAN()),
WithNoFixture(ES3_VULKAN_SWIFTSHADER()));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationBlitFramebufferTest);
ANGLE_INSTANTIATE_TEST_COMBINE_1(EGLPreRotationBlitFramebufferTest,
PrintToStringParamName,
testing::Bool(),
WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES3_VULKAN()),
WithNoFixture(ES3_VULKAN_SWIFTSHADER()));
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLPreRotationInterpolateAtOffsetTest);
src/tests/egl_tests/EGLProgramCacheControlTest.cpp
......@@ -261,6 +261,7 @@ TEST_P(EGLProgramCacheControlTest, LinkProgramWithBadShaders)
glDeleteProgram(program);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLProgramCacheControlTest);
ANGLE_INSTANTIATE_TEST(EGLProgramCacheControlTest,
ES2_D3D9(),
ES2_D3D11(),
......
src/tests/egl_tests/EGLQueryContextTest.cpp
......@@ -150,6 +150,7 @@ TEST_P(EGLQueryContextTest, BadAttribute)
EXPECT_TRUE(eglGetError() == EGL_BAD_ATTRIBUTE);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLQueryContextTest);
ANGLE_INSTANTIATE_TEST(EGLQueryContextTest,
WithNoFixture(ES2_D3D9()),
WithNoFixture(ES2_D3D11()),
......
src/tests/egl_tests/EGLRobustnessTest.cpp
......@@ -222,6 +222,7 @@ TEST_P(EGLRobustnessTest, DISABLED_ResettingDisplayWorks)
ASSERT_TRUE(glGetGraphicsResetStatusEXT() == GL_NO_ERROR);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLRobustnessTest);
ANGLE_INSTANTIATE_TEST(EGLRobustnessTest,
WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES2_D3D9()),
......
src/tests/egl_tests/EGLSurfaceTest.cpp
......@@ -1311,16 +1311,17 @@ ANGLE_INSTANTIATE_TEST(EGLSurfaceTest,
WithNoFixture(ES3_VULKAN()),
WithNoFixture(ES2_VULKAN_SWIFTSHADER()),
WithNoFixture(ES3_VULKAN_SWIFTSHADER()));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLFloatSurfaceTest);
ANGLE_INSTANTIATE_TEST(EGLFloatSurfaceTest,
WithNoFixture(ES2_OPENGL()),
WithNoFixture(ES3_OPENGL()),
WithNoFixture(ES2_VULKAN()),
WithNoFixture(ES3_VULKAN()));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLSurfaceTest3);
ANGLE_INSTANTIATE_TEST(EGLSurfaceTest3, WithNoFixture(ES3_VULKAN()));
#if defined(ANGLE_ENABLE_D3D11)
ANGLE_INSTANTIATE_TEST(EGLSurfaceTestD3D11, WithNoFixture(ES2_D3D11()), WithNoFixture(ES3_D3D11()));
#endif
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLSurfaceTest3);
src/tests/gl_tests/BlitFramebufferANGLETest.cpp
......@@ -2526,6 +2526,7 @@ TEST_P(BlitFramebufferTest, BlitFramebufferSizeOverflow2)
// Use this to select which configurations (e.g. which renderer, which GLES major version) these
// tests should be run against.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(BlitFramebufferANGLETest);
ANGLE_INSTANTIATE_TEST(BlitFramebufferANGLETest,
ES2_D3D9(),
ES2_D3D11(),
......
src/tests/gl_tests/ClearTest.cpp
......@@ -2481,6 +2481,8 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(MaskedScissoredClearTest,
ES3_VULKAN(),
ES2_METAL(),
ES3_METAL());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VulkanClearTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(VulkanClearTest,
MaskedScissoredClearVariationsTestPrint,
testing::Range(0, 3),
......@@ -2491,6 +2493,7 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(VulkanClearTest,
ES3_VULKAN());
// Not all ANGLE backends support RGB backbuffers
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(ClearTestRGB);
ANGLE_INSTANTIATE_TEST(ClearTestRGB,
ES2_D3D11(),
ES3_D3D11(),
......@@ -2499,7 +2502,4 @@ ANGLE_INSTANTIATE_TEST(ClearTestRGB,
ES2_METAL(),
ES3_METAL());
// This test suite is not instantiated on some OSes.
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VulkanClearTest);
} // anonymous namespace
src/tests/gl_tests/FramebufferMultiviewTest.cpp
......@@ -759,11 +759,14 @@ TEST_P(FramebufferMultiviewTest, NegativeMultisampledFramebufferTest)
EXPECT_GL_ERROR(GL_INVALID_OPERATION);
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FramebufferMultiviewTest);
ANGLE_INSTANTIATE_TEST(FramebufferMultiviewTest,
VertexShaderOpenGL(3, 0, ExtensionName::multiview),
GeomShaderD3D11(3, 0, ExtensionName::multiview),
VertexShaderOpenGL(3, 0, ExtensionName::multiview2),
GeomShaderD3D11(3, 0, ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(FramebufferMultiviewLayeredClearTest);
ANGLE_INSTANTIATE_TEST(FramebufferMultiviewLayeredClearTest,
VertexShaderOpenGL(3, 0, ExtensionName::multiview),
GeomShaderD3D11(3, 0, ExtensionName::multiview),
......
src/tests/gl_tests/GetImageTest.cpp
......@@ -410,10 +410,10 @@ TEST_P(GetImageTest, GetTexImageAlpha)
}
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(GetImageTest);
ANGLE_INSTANTIATE_TEST(GetImageTest, 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);
ANGLE_INSTANTIATE_TEST(GetImageTestNoExtensions, ES2_VULKAN(), ES3_VULKAN());
} // namespace
\ No newline at end of file
src/tests/gl_tests/MemoryBarrierTest.cpp
......@@ -4249,6 +4249,7 @@ constexpr NoopOp kNoopOps[] = {
// Note: due to large number of tests, these are only run on Vulkan and a single configuration
// (swiftshader).
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MemoryBarrierBufferTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierBufferTest,
MemoryBarrierVariationsTestPrint,
testing::ValuesIn(kWritePipelines),
......@@ -4257,6 +4258,7 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierBufferTest,
testing::ValuesIn(kNoopOps),
ES31_VULKAN_SWIFTSHADER());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MemoryBarrierImageTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageTest,
MemoryBarrierVariationsTestPrint,
testing::ValuesIn(kWritePipelines),
......@@ -4265,6 +4267,7 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageTest,
testing::ValuesIn(kNoopOps),
ES31_VULKAN_SWIFTSHADER());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MemoryBarrierImageBufferOnlyTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageBufferOnlyTest,
MemoryBarrierVariationsTestPrint,
testing::ValuesIn(kWritePipelines),
......@@ -4273,6 +4276,7 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageBufferOnlyTest,
testing::ValuesIn(kNoopOps),
ES31_VULKAN_SWIFTSHADER());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MemoryBarrierImageOnlyTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageOnlyTest,
MemoryBarrierVariationsTestPrint,
testing::ValuesIn(kWritePipelines),
......@@ -4281,6 +4285,7 @@ ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierImageOnlyTest,
testing::ValuesIn(kNoopOps),
ES31_VULKAN_SWIFTSHADER());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MemoryBarrierBufferOnlyTest);
ANGLE_INSTANTIATE_TEST_COMBINE_4(MemoryBarrierBufferOnlyTest,
MemoryBarrierVariationsTestPrint,
testing::ValuesIn(kWritePipelines),
......
src/tests/gl_tests/MultiviewDrawTest.cpp
......@@ -2273,11 +2273,14 @@ MultiviewRenderTestParams MultisampledVertexShaderD3D11(ExtensionName multiviewE
return MultiviewRenderTestParams(2, VertexShaderD3D11(3, 1, multiviewExtension));
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewDrawValidationTest);
ANGLE_INSTANTIATE_TEST(MultiviewDrawValidationTest,
VertexShaderOpenGL(3, 1, ExtensionName::multiview),
VertexShaderD3D11(3, 1, ExtensionName::multiview),
VertexShaderOpenGL(3, 1, ExtensionName::multiview2),
VertexShaderD3D11(3, 1, ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewRenderDualViewTest);
ANGLE_INSTANTIATE_TEST(MultiviewRenderDualViewTest,
VertexShaderOpenGL(ExtensionName::multiview),
MultisampledVertexShaderOpenGL(ExtensionName::multiview),
......@@ -2289,6 +2292,8 @@ ANGLE_INSTANTIATE_TEST(MultiviewRenderDualViewTest,
GeomShaderD3D11(ExtensionName::multiview2),
VertexShaderD3D11(ExtensionName::multiview2),
MultisampledVertexShaderD3D11(ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewRenderTest);
ANGLE_INSTANTIATE_TEST(MultiviewRenderTest,
VertexShaderOpenGL(ExtensionName::multiview),
MultisampledVertexShaderOpenGL(ExtensionName::multiview),
......@@ -2300,6 +2305,8 @@ ANGLE_INSTANTIATE_TEST(MultiviewRenderTest,
GeomShaderD3D11(ExtensionName::multiview2),
VertexShaderD3D11(ExtensionName::multiview2),
MultisampledVertexShaderD3D11(ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewOcclusionQueryTest);
ANGLE_INSTANTIATE_TEST(MultiviewOcclusionQueryTest,
VertexShaderOpenGL(ExtensionName::multiview),
GeomShaderD3D11(ExtensionName::multiview),
......@@ -2307,6 +2314,8 @@ ANGLE_INSTANTIATE_TEST(MultiviewOcclusionQueryTest,
VertexShaderOpenGL(ExtensionName::multiview2),
GeomShaderD3D11(ExtensionName::multiview2),
VertexShaderD3D11(ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewProgramGenerationTest);
ANGLE_INSTANTIATE_TEST(MultiviewProgramGenerationTest,
VertexShaderOpenGL(3, 0, ExtensionName::multiview),
GeomShaderD3D11(3, 0, ExtensionName::multiview),
......@@ -2314,6 +2323,8 @@ ANGLE_INSTANTIATE_TEST(MultiviewProgramGenerationTest,
VertexShaderOpenGL(3, 0, ExtensionName::multiview2),
GeomShaderD3D11(3, 0, ExtensionName::multiview2),
VertexShaderD3D11(3, 0, ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewRenderPrimitiveTest);
ANGLE_INSTANTIATE_TEST(MultiviewRenderPrimitiveTest,
VertexShaderOpenGL(ExtensionName::multiview),
GeomShaderD3D11(ExtensionName::multiview),
......@@ -2321,11 +2332,10 @@ ANGLE_INSTANTIATE_TEST(MultiviewRenderPrimitiveTest,
VertexShaderOpenGL(ExtensionName::multiview2),
GeomShaderD3D11(ExtensionName::multiview2),
VertexShaderD3D11(ExtensionName::multiview2));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(MultiviewLayeredRenderTest);
ANGLE_INSTANTIATE_TEST(MultiviewLayeredRenderTest,
VertexShaderOpenGL(ExtensionName::multiview),
GeomShaderD3D11(ExtensionName::multiview),
VertexShaderOpenGL(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
src/tests/perf_tests/EGLMakeCurrentPerf.cpp
......@@ -145,6 +145,7 @@ TEST_P(EGLMakeCurrentPerfTest, Run)
run();
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(EGLMakeCurrentPerfTest);
#if !defined(ANGLE_PLATFORM_ANDROID)
ANGLE_INSTANTIATE_TEST(EGLMakeCurrentPerfTest,
angle::ES2_D3D11(),
......
src/tests/perf_tests/PreRotationPerf.cpp
......@@ -204,6 +204,7 @@ TEST_P(PreRotationBenchmark, Run)
using namespace params;
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PreRotationBenchmark);
ANGLE_INSTANTIATE_TEST(PreRotationBenchmark,
VulkanParams(PreRotation::_0),
VulkanParams(PreRotation::_90),
......
src/tests/perf_tests/TextureSampling.cpp
......@@ -343,4 +343,5 @@ ANGLE_INSTANTIATE_TEST(TextureSamplingBenchmark,
OpenGLOrGLESParams(),
VulkanParams());
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TextureSamplingMutableFormatBenchmark);
ANGLE_INSTANTIATE_TEST(TextureSamplingMutableFormatBenchmark, VulkanParams());
src/tests/perf_tests/TextureUploadPerf.cpp
......@@ -420,10 +420,12 @@ ANGLE_INSTANTIATE_TEST(TextureUploadFullMipBenchmark,
VulkanParams(false),
VulkanParams(true));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PBOSubImageBenchmark);
ANGLE_INSTANTIATE_TEST(PBOSubImageBenchmark,
ES3OpenGLPBOParams(1024, 128),
VulkanPBOParams(1024, 128));
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(PBOCompressedSubImageBenchmark);
ANGLE_INSTANTIATE_TEST(PBOCompressedSubImageBenchmark,
ES3OpenGLPBOParams(128, 128),
VulkanPBOParams(128, 128));
src/tests/perf_tests/VulkanBarriersPerf.cpp
......@@ -402,6 +402,7 @@ TEST_P(VulkanBarriersPerfBenchmark, Run)
run();
}
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(VulkanBarriersPerfBenchmark);
ANGLE_INSTANTIATE_TEST(VulkanBarriersPerfBenchmark,
VulkanBarriersPerfParams(false, false, false),
VulkanBarriersPerfParams(true, false, false),
......
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