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/test_utils/ANGLETest.cpp

diff --git a/src/tests/test_utils/ANGLETest.cpp b/src/tests/test_utils/ANGLETest.cpp
index 6cbf7e6..c8236d9 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -704,6 +704,23 @@
     return IsD3D9() || IsD3D11_FL93();
 }
 
+bool IsDesktopOpenGL()
+{
+    return IsOpenGL() && !IsOpenGLES();
+}
+
+bool IsOpenGLES()
+{
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return (rendererString.find("OpenGL ES") != std::string::npos);
+}
+
+bool IsOpenGL()
+{
+    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
+    return (rendererString.find("OpenGL") != std::string::npos);
+}
+
 bool IsAndroid()
 {
 #if defined(ANGLE_PLATFORM_ANDROID)
@@ -731,14 +748,13 @@
 #endif
 }
 
-bool ANGLETest::isOpenGL() const
+bool IsWindows()
 {
-    return getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
-}
-
-bool ANGLETest::isGLES() const
-{
-    return getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGLES_ANGLE;
+#if defined(ANGLE_PLATFORM_WINDOWS)
+    return true;
+#else
+    return false;
+#endif
 }
 
 EGLint ANGLETest::getPlatformRenderer() const