commit f09bf6698d58203177ec48b87b89a1845ca9d303
author Jamie Madill <jmadill@chromium.org> Wed Mar 02 11:26:01 2016 -0500
committer Jamie Madill <jmadill@chromium.org> Wed Mar 02 16:27:16 2016 +0000
tree d1a4008002746cbc4dea8c26d470537dba78edbe
parent bc21e18b8ec49ac543b8941272da36cbf79fb4cb

Revert "Suppress some failing end2end_tests on Intel."

This reverts commit 7208f6994cf7d810c2226965362aad43d2a66f53.

Still some failures on Intel, requires a slightly different solution.

BUG=589851

Change-Id: I6ac6599249e9e0f6319c917e04734cd48ca9274d
Reviewed-on: https://chromium-review.googlesource.com/329734
Reviewed-by: 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 046b449..9c00cf5 100644
--- a/src/tests/gl_tests/GLSLTest.cpp
+++ b/src/tests/gl_tests/GLSLTest.cpp
@@ -462,13 +462,21 @@
 
 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 (isOpenGL() && (IsOSX() || !IsNVIDIA()))
+    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
     {
-        std::cout << "Test disabled on this OpenGL configuration." << std::endl;
+        std::cout << "Test disabled on AMD OpenGL." << std::endl;
         return;
     }
 
@@ -804,7 +812,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;
@@ -829,7 +837,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;
@@ -885,7 +893,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;
@@ -900,7 +908,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;
@@ -915,7 +923,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;
@@ -931,7 +939,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;
@@ -947,7 +955,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;
@@ -963,7 +971,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;