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/MipmapTest.cpp

diff --git a/src/tests/gl_tests/MipmapTest.cpp b/src/tests/gl_tests/MipmapTest.cpp
index 40cc705..9691b18 100644
--- a/src/tests/gl_tests/MipmapTest.cpp
+++ b/src/tests/gl_tests/MipmapTest.cpp
@@ -910,7 +910,7 @@
 // the levelbase array, are left unchanged by this computation."
 TEST_P(MipmapTestES3, GenerateMipmapBaseLevel)
 {
-    if (IsAMD() && isOpenGL())
+    if (IsAMD() && IsDesktopOpenGL())
     {
         // Observed incorrect rendering on AMD, sampling level 2 returns black.
         std::cout << "Test skipped on AMD OpenGL." << std::endl;
@@ -949,7 +949,7 @@
     clearAndDrawQuad(m2DProgram, getWindowWidth() / 4, getWindowHeight() / 4);
     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
 
-    if (IsNVIDIA() && (isOpenGL() || isGLES()))
+    if (IsNVIDIA() && IsOpenGL())
     {
         // Observed incorrect rendering on NVIDIA, level zero seems to be incorrectly affected by
         // GenerateMipmap.
@@ -971,7 +971,7 @@
 // the levelbase array, are left unchanged by this computation."
 TEST_P(MipmapTestES3, GenerateMipmapCubeBaseLevel)
 {
-    if (IsAMD() && isOpenGL())
+    if (IsAMD() && IsDesktopOpenGL())
     {
         // Observed incorrect rendering on AMD, sampling level 2 returns black.
         std::cout << "Test skipped on AMD OpenGL." << std::endl;
@@ -1010,7 +1010,7 @@
     clearAndDrawQuad(mCubeProgram, getWindowWidth() / 4, getWindowHeight() / 4);
     EXPECT_PIXEL_COLOR_EQ(getWindowWidth() / 8, getWindowHeight() / 8, GLColor::red);
 
-    if (IsNVIDIA() && (isOpenGL() || isGLES()))
+    if (IsNVIDIA() && IsOpenGL())
     {
         // Observed incorrect rendering on NVIDIA, level zero seems to be incorrectly affected by
         // GenerateMipmap.