Commit 6affeef6 by Kenneth Russell

Suppress angle_end2end_tests failures on Linux/NVIDIA and Linux/AMD.

Verified the NVIDIA suppression locally; assuming the AMD suppression will take effect on the bot. Thanks to geofflang@ and cwallez@ for the suggestion on the approach to take. BUG=angleproject:892 Change-Id: Ida4b6c1395185b0dfb0ea890395e35cb6db7ccd5 Reviewed-on: https://chromium-review.googlesource.com/283974Tested-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarBrandon Jones <bajones@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 2f232370
...@@ -31,7 +31,7 @@ const EGLint contextAttribs[] = ...@@ -31,7 +31,7 @@ const EGLint contextAttribs[] =
} }
class EGLContextCompatibilityTest : public testing::TestWithParam<PlatformParameters> class EGLContextCompatibilityTest : public ANGLETest
{ {
public: public:
EGLContextCompatibilityTest() EGLContextCompatibilityTest()
...@@ -200,6 +200,15 @@ class EGLContextCompatibilityTest : public testing::TestWithParam<PlatformParame ...@@ -200,6 +200,15 @@ class EGLContextCompatibilityTest : public testing::TestWithParam<PlatformParame
// same config can render. // same config can render.
TEST_P(EGLContextCompatibilityTest, WindowSameConfig) TEST_P(EGLContextCompatibilityTest, WindowSameConfig)
{ {
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++) for (size_t i = 0; i < mConfigs.size(); i++)
{ {
EGLConfig config = mConfigs[i]; EGLConfig config = mConfigs[i];
...@@ -219,6 +228,15 @@ TEST_P(EGLContextCompatibilityTest, WindowSameConfig) ...@@ -219,6 +228,15 @@ TEST_P(EGLContextCompatibilityTest, WindowSameConfig)
// same config can render. // same config can render.
TEST_P(EGLContextCompatibilityTest, PbufferSameConfig) TEST_P(EGLContextCompatibilityTest, PbufferSameConfig)
{ {
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++) for (size_t i = 0; i < mConfigs.size(); i++)
{ {
EGLConfig config = mConfigs[i]; EGLConfig config = mConfigs[i];
...@@ -238,6 +256,15 @@ TEST_P(EGLContextCompatibilityTest, PbufferSameConfig) ...@@ -238,6 +256,15 @@ TEST_P(EGLContextCompatibilityTest, PbufferSameConfig)
// config works or errors according to the EGL compatibility rules // config works or errors according to the EGL compatibility rules
TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig) TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
{ {
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++) for (size_t i = 0; i < mConfigs.size(); i++)
{ {
EGLConfig config1 = mConfigs[i]; EGLConfig config1 = mConfigs[i];
...@@ -262,6 +289,15 @@ TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig) ...@@ -262,6 +289,15 @@ TEST_P(EGLContextCompatibilityTest, WindowDifferentConfig)
// config works or errors according to the EGL compatibility rules // config works or errors according to the EGL compatibility rules
TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig) TEST_P(EGLContextCompatibilityTest, PbufferDifferentConfig)
{ {
// TODO(cwallez): figure out why this is broken on Linux/AMD.
#ifdef ANGLE_PLATFORM_LINUX
if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux AMD on OpenGL." << std::endl;
return;
}
#endif
for (size_t i = 0; i < mConfigs.size(); i++) for (size_t i = 0; i < mConfigs.size(); i++)
{ {
EGLConfig config1 = mConfigs[i]; EGLConfig config1 = mConfigs[i];
......
...@@ -86,6 +86,15 @@ class IncompleteTextureTest : public ANGLETest ...@@ -86,6 +86,15 @@ class IncompleteTextureTest : public ANGLETest
TEST_P(IncompleteTextureTest, IncompleteTexture2D) TEST_P(IncompleteTextureTest, IncompleteTexture2D)
{ {
// TODO(cwallez): figure out why this is broken on Linux/NVIDIA.
#ifdef ANGLE_PLATFORM_LINUX
if (isNVidia() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
{
std::cout << "Test skipped on Linux NVIDIA on OpenGL." << std::endl;
return;
}
#endif
GLuint tex; GLuint tex;
glGenTextures(1, &tex); glGenTextures(1, &tex);
glActiveTexture(GL_TEXTURE0); glActiveTexture(GL_TEXTURE0);
......
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