commit 7208f6994cf7d810c2226965362aad43d2a66f53
author Jamie Madill <jmadill@chromium.org> Mon Feb 29 10:47:35 2016 -0500
committer Commit Bot <commit-bot@chromium.org> Mon Feb 29 17:55:17 2016 +0000
tree c10992042eb566a963c6b343b2e5faf19f87ded0
parent eae0c7d4233c1a8a8b5bf014273b5c385966abd5

Suppress some failing end2end_tests on Intel.

BUG=589851

Change-Id: I91588014784a8a9b75389aeb596923458c30d80a
Reviewed-on: https://chromium-review.googlesource.com/329427
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 b1fb777..ee14e6c 100644
--- a/src/tests/test_utils/ANGLETest.cpp
+++ b/src/tests/test_utils/ANGLETest.cpp
@@ -433,58 +433,62 @@
     mOSWindow->setVisible(isVisible);
 }
 
-bool ANGLETest::isIntel() const
+bool IsIntel()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Intel") != std::string::npos);
 }
 
-bool ANGLETest::isAMD() const
+bool IsAMD()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("AMD") != std::string::npos) ||
            (rendererString.find("ATI") != std::string::npos);
 }
 
-bool ANGLETest::isNVidia() const
+bool IsNVIDIA()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("NVIDIA") != std::string::npos);
 }
 
-bool ANGLETest::isD3D11() const
+bool IsD3D11()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_5_0") != std::string::npos);
 }
 
-bool ANGLETest::isD3D11_FL93() const
+bool IsD3D11_FL93()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D11 vs_4_0_") != std::string::npos);
 }
 
-bool ANGLETest::isD3D9() const
+bool IsD3D9()
 {
     std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
     return (rendererString.find("Direct3D9") != std::string::npos);
 }
 
-bool ANGLETest::isD3DSM3() const
+bool IsD3DSM3()
 {
-    std::string rendererString(reinterpret_cast<const char *>(glGetString(GL_RENDERER)));
-    return isD3D9() || isD3D11_FL93();
+    return IsD3D9() || IsD3D11_FL93();
 }
 
-bool ANGLETest::isOSX() const
+bool IsOSX()
 {
-#ifdef __APPLE__
+#if defined(__APPLE__)
     return true;
 #else
     return false;
 #endif
 }
 
+bool ANGLETest::isOpenGL() const
+{
+    return getPlatformRenderer() == EGL_PLATFORM_ANGLE_TYPE_OPENGL_ANGLE;
+}
+
 EGLint ANGLETest::getPlatformRenderer() const
 {
     assert(mEGLWindow);