commit 7208f6994cf7d810c2226965362aad43d2a66f53
author Jamie Madill <jmadill@chromium.org> Mon Feb 29 10:47:35 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Feb 29 17:55:17 2016 +0000
tree c10992042eb566a963c6b343b2e5faf19f87ded0
parent eae0c7d4233c1a8a8b5bf014273b5c385966abd5

Suppress some failing end2end_tests on Intel.

BUG=589851

Change-Id: I91588014784a8a9b75389aeb596923458c30d80a
Reviewed-on: https://chromium-review.googlesource.com/329427
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

src/tests/gl_tests/GLSLTest.cpp

diff --git a/src/tests/gl_tests/GLSLTest.cpp b/src/tests/gl_tests/GLSLTest.cpp
index 9c00cf5..046b449 100644
--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -462,21 +462,13 @@
 
 TEST_P(GLSLTest, ScopedStructsOrderBug)
 {
-#if defined(__APPLE__)
     // TODO(geofflang): Find out why this doesn't compile on Apple OpenGL drivers
     // (http://anglebug.com/1292)
-    if (getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
-    {
-        std::cout << "Test disabled on Apple OpenGL." << std::endl;
-        return;
-    }
-#endif
-
     // TODO(geofflang): Find out why this doesn't compile on AMD OpenGL drivers
     // (http://anglebug.com/1291)
-    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    if (isOpenGL() && (IsOSX() || !IsNVIDIA()))
     {
-        std::cout << "Test disabled on AMD OpenGL." << std::endl;
+        std::cout << "Test disabled on this OpenGL configuration." << std::endl;
         return;
     }
 
@@ -812,7 +804,7 @@
 #if defined(__APPLE__)
     // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
     // (http://anglebug.com/1291)
-    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
         return;
@@ -837,7 +829,7 @@
 TEST_P(GLSLTest, MaxMinusTwoVaryingVec4PlusThreeSpecialVariables)
 {
     // TODO(geofflang): Figure out why this fails on OpenGL AMD (http://anglebug.com/1291)
-    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test disabled on OpenGL." << std::endl;
         return;
@@ -893,7 +885,7 @@
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec3AndOneFloat)
 {
-    if (isD3D9())
+    if (IsD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -908,7 +900,7 @@
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec3ArrayAndOneFloatArray)
 {
-    if (isD3D9())
+    if (IsD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -923,7 +915,7 @@
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, TwiceMaxVaryingVec2)
 {
-    if (isD3D9())
+    if (IsD3D9())
     {
         std::cout << "Test disabled on D3D9." << std::endl;
         return;
@@ -939,7 +931,7 @@
 #if defined(__APPLE__)
     // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
     // (http://anglebug.com/1291)
-    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
         return;
@@ -955,7 +947,7 @@
 // Disabled because of a failure in D3D9
 TEST_P(GLSLTest, MaxVaryingVec2Arrays)
 {
-    if (isD3DSM3())
+    if (IsD3DSM3())
     {
         std::cout << "Test disabled on SM3." << std::endl;
         return;
@@ -971,7 +963,7 @@
 #if defined(__APPLE__)
     // TODO(geofflang): Find out why this doesn't compile on Apple AND OpenGL drivers
     // (http://anglebug.com/1291)
-    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    if (IsAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
         std::cout << "Test disabled on Apple AMD OpenGL." << std::endl;
         return;