Clean up passed end2end tests on Intel Linux platforms.

Only one end2end test still fail for ANGLE issue 1346. BUG=angleproject:1346 Change-Id: Ibeefe600b21b6ae2056e304d18a8fc4071a48cbe Reviewed-on: https://chromium-review.googlesource.com/882294Reviewed-by: Jiajia Qin <jiajia.qin@intel.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Clean up passed end2end tests on Intel Linux platforms.
14cb42c0 · Yunchao He · Commit Bot · 64d065e2 · 14cb42c0 · 14cb42c0
Commit 14cb42c0 authored Jan 24, 2018 by Yunchao He Committed by Commit Bot Feb 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 25 deletions

StateChangeTest.cpp src/tests/gl_tests/StateChangeTest.cpp +0 -7

TextureTest.cpp src/tests/gl_tests/TextureTest.cpp +3 -18

No files found.
--- a/src/tests/gl_tests/StateChangeTest.cpp
+++ b/src/tests/gl_tests/StateChangeTest.cpp
@@ -486,13 +486,6 @@ class StateChangeRenderTest : public StateChangeTest
 // Test that re-creating a currently attached texture works as expected.
 TEST_P(StateChangeRenderTest, RecreateTexture)
 {
-    if (IsIntel() && IsLinux())
-    {
-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
-        return;
-    }
    glBindFramebuffer(GL_FRAMEBUFFER, mFramebuffer);
    glBindTexture(GL_TEXTURE_2D, mTextures[0]);

--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -1560,25 +1560,11 @@ TEST_P(Texture2DTest, CopySubImageFloat_RG_RG)
 TEST_P(Texture2DTest, CopySubImageFloat_RGB_R)
 {
-    if (IsIntel() && IsLinux())
-    {
-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
-        return;
-    }
    testFloatCopySubImage(3, 1);
 }
 TEST_P(Texture2DTest, CopySubImageFloat_RGB_RG)
 {
-    if (IsIntel() && IsLinux())
-    {
-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
-        std::cout << "Test disabled on Linux Intel OpenGL." << std::endl;
-        return;
-    }
    testFloatCopySubImage(3, 2);
 }
@@ -2819,11 +2805,10 @@ TEST_P(Texture2DTestES3, TextureCOMPRESSEDRGB8ETC2ImplicitAlpha1)
 // ES 3.0.4 table 3.24
 TEST_P(Texture2DTestES3, TextureCOMPRESSEDSRGB8ETC2ImplicitAlpha1)
 {
-    if (IsIntel() && IsOpenGL() && (IsLinux() || IsOSX()))
+    if (IsOSX() && IsIntel() && IsOpenGL())
    {
-        // TODO(cwallez): Fix on Linux Intel drivers (http://anglebug.com/1346)
+        // Seems to fail on OSX 10.12 Intel.
-        // Also seems to fail on OSX 10.12 Intel.
+        std::cout << "Test skipped on OSX Intel." << std::endl;
-        std::cout << "Test disabled on Linux and OSX Intel OpenGL." << std::endl;
        return;
    }