commit c7f59d02f128a96ac971620d4d4ec32654a79ff9
author Corentin Wallez <cwallez@chromium.org> Mon Jun 20 10:12:08 2016 -0400
committer Commit Bot <commit-bot@chromium.org> Mon Jun 20 14:32:02 2016 +0000
tree feec66cbe6d2b3ce8c4239370cc4debb7e59f420
parent e45e53bd209f2e29e4fb97dd4a165457e3db94a9

Suppress a Wintel/OpenGL failure on a new test.

BUG=angleproject:1388

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

src/tests/gl_tests/TextureTest.cpp

diff --git a/src/tests/gl_tests/TextureTest.cpp b/src/tests/gl_tests/TextureTest.cpp
index 85dc554..48f01bc 100644
--- a/src/tests/gl_tests/TextureTest.cpp
+++ b/src/tests/gl_tests/TextureTest.cpp
@@ -2215,19 +2215,19 @@
 // Test that changing base level works when it affects the format of the texture.
 TEST_P(Texture2DTestES3, TextureFormatChangesWithBaseLevel)
 {
-    if (IsNVIDIA() && (isOpenGL() || isGLES()))
+    if (IsNVIDIA() && IsOpenGL())
     {
         // Observed rendering corruption on NVIDIA OpenGL.
         std::cout << "Test skipped on NVIDIA OpenGL." << std::endl;
         return;
     }
-    if (IsIntel() && isOpenGL())
+    if (IsIntel() && IsDesktopOpenGL())
     {
         // Observed incorrect rendering on Intel OpenGL.
         std::cout << "Test skipped on Intel OpenGL." << std::endl;
         return;
     }
-    if (IsAMD() && isOpenGL())
+    if (IsAMD() && IsDesktopOpenGL())
     {
         // Observed incorrect rendering on AMD OpenGL.
         std::cout << "Test skipped on AMD OpenGL." << std::endl;
@@ -3323,7 +3323,7 @@
 // GLES 3.0.4 section 3.8.3.
 TEST_P(Texture2DTestES3, UnpackSkipImages2D)
 {
-    if (IsIntel() && isOpenGL())
+    if (IsIntel() && IsDesktopOpenGL())
     {
         std::cout << "Test skipped on Intel OpenGL." << std::endl;
         return;