Supress AMD OpenGL failures in angle_end2end_tests.

src/tests/gl_tests/GLSLTest.cpp

@@ -470,15 +470,15 @@ TEST_P(GLSLTest, ScopedStructsOrderBug)
         std::cout << "Test disabled on Apple OpenGL." << std::endl;
         return;
     }
-#elif defined(_WIN32)
-    // TODO(geofflang): Find out why this doesn't compile on Windows AMD OpenGL drivers
+#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)
     {
-        std::cout << "Test disabled on Windows AMD OpenGL." << std::endl;
+        std::cout << "Test disabled on AMD OpenGL." << std::endl;
         return;
     }
-#endif
 
     const std::string fragmentShaderSource = SHADER_SOURCE
     (

src/tests/gl_tests/StateChangeTest.cpp

@@ -75,6 +75,13 @@ class StateChangeTestES3 : public StateChangeTest
 // Ensure that CopyTexImage2D syncs framebuffer changes.
 TEST_P(StateChangeTest, CopyTexImage2DSync)
 {
+    if (isAMD() && getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE)
+    {
+        // TODO(geofflang): Fix on Linux AMD drivers (http://anglebug.com/1291)
+        std::cout << "Test disabled on AMD OpenGL." << std::endl;
+        return;
+    }
+
     glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
 
     // Init first texture to red