Commit b2ff69f8 by Jamie Madill Committed by Commit Bot

Suppress Mac/GL test failures with standalone runner.

These tests fail when run in certain orders with display reusei on the bots. See issues for list of suppressed tests. Bug: angleproject:5154 Bug: angleproject:5153 Change-Id: I1b4a523ba000785f4f8c26eeb236c518481ed7af Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2462715 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent c759206c
...@@ -3030,6 +3030,9 @@ TEST_P(Texture2DBaseMaxTestES3, ExtendMipChainAfterRedefine) ...@@ -3030,6 +3030,9 @@ TEST_P(Texture2DBaseMaxTestES3, ExtendMipChainAfterRedefine)
// http://anglebug.com/4699 // http://anglebug.com/4699
ANGLE_SKIP_TEST_IF(IsOpenGL() && IsIntel() && IsOSX()); ANGLE_SKIP_TEST_IF(IsOpenGL() && IsIntel() && IsOSX());
// http://anglebug.com/5153
ANGLE_SKIP_TEST_IF(IsOpenGL() && IsNVIDIA() && IsOSX());
GLFramebuffer framebuffer; GLFramebuffer framebuffer;
glBindFramebuffer(GL_FRAMEBUFFER, framebuffer); glBindFramebuffer(GL_FRAMEBUFFER, framebuffer);
...@@ -5873,16 +5876,25 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RGBA16SNORMTextureTest) ...@@ -5873,16 +5876,25 @@ TEST_P(Texture2DNorm16TestES3, TextureNorm16RGBA16SNORMTextureTest)
TEST_P(Texture2DNorm16TestES3, TextureNorm16R16RenderTest) TEST_P(Texture2DNorm16TestES3, TextureNorm16R16RenderTest)
{ {
// http://anglebug.com/5153
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL() && IsNVIDIA());
testNorm16RenderAndReadPixels(GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT); testNorm16RenderAndReadPixels(GL_R16_EXT, GL_RED, GL_UNSIGNED_SHORT);
} }
TEST_P(Texture2DNorm16TestES3, TextureNorm16RG16RenderTest) TEST_P(Texture2DNorm16TestES3, TextureNorm16RG16RenderTest)
{ {
// http://anglebug.com/5153
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL() && IsNVIDIA());
testNorm16RenderAndReadPixels(GL_RG16_EXT, GL_RG, GL_UNSIGNED_SHORT); testNorm16RenderAndReadPixels(GL_RG16_EXT, GL_RG, GL_UNSIGNED_SHORT);
} }
TEST_P(Texture2DNorm16TestES3, TextureNorm16RGBA16RenderTest) TEST_P(Texture2DNorm16TestES3, TextureNorm16RGBA16RenderTest)
{ {
// http://anglebug.com/5153
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL() && IsNVIDIA());
testNorm16RenderAndReadPixels(GL_RGBA16_EXT, GL_RGBA, GL_UNSIGNED_SHORT); testNorm16RenderAndReadPixels(GL_RGBA16_EXT, GL_RGBA, GL_UNSIGNED_SHORT);
} }
......
...@@ -91,6 +91,9 @@ TEST_P(TimerQueriesTest, TimeElapsed) ...@@ -91,6 +91,9 @@ TEST_P(TimerQueriesTest, TimeElapsed)
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_disjoint_timer_query"));
// http://anglebug.com/5154
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
GLint queryTimeElapsedBits = 0; GLint queryTimeElapsedBits = 0;
glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits); glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
......
...@@ -85,6 +85,9 @@ class TransformFeedbackTest : public TransformFeedbackTestBase ...@@ -85,6 +85,9 @@ class TransformFeedbackTest : public TransformFeedbackTestBase
TEST_P(TransformFeedbackTest, ZeroSizedViewport) TEST_P(TransformFeedbackTest, ZeroSizedViewport)
{ {
// http://anglebug.com/5154
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
// Set the program's transform feedback varyings (just gl_Position) // Set the program's transform feedback varyings (just gl_Position)
std::vector<std::string> tfVaryings; std::vector<std::string> tfVaryings;
tfVaryings.push_back("gl_Position"); tfVaryings.push_back("gl_Position");
...@@ -126,6 +129,9 @@ TEST_P(TransformFeedbackTest, ZeroSizedViewport) ...@@ -126,6 +129,9 @@ TEST_P(TransformFeedbackTest, ZeroSizedViewport)
// old position) // old position)
TEST_P(TransformFeedbackTest, BufferRebinding) TEST_P(TransformFeedbackTest, BufferRebinding)
{ {
// http://anglebug.com/5154
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
// Set the program's transform feedback varyings (just gl_Position) // Set the program's transform feedback varyings (just gl_Position)
...@@ -334,6 +340,9 @@ TEST_P(TransformFeedbackTest, DISABLED_TooSmallBuffers) ...@@ -334,6 +340,9 @@ TEST_P(TransformFeedbackTest, DISABLED_TooSmallBuffers)
// Test that buffer binding happens only on the current transform feedback object // Test that buffer binding happens only on the current transform feedback object
TEST_P(TransformFeedbackTest, BufferBinding) TEST_P(TransformFeedbackTest, BufferBinding)
{ {
// http://anglebug.com/5154
ANGLE_SKIP_TEST_IF(IsOSX() && IsOpenGL());
// Reset any state // Reset any state
glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0); glBindTransformFeedback(GL_TRANSFORM_FEEDBACK, 0);
glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 0); glBindBufferBase(GL_TRANSFORM_FEEDBACK_BUFFER, 0, 0);
......
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