Skip TimerQueriesTest.TimeElapsedMulticontextTest on all AMD

Was skipped on Windows and Mac before, now seen flaky also on Linux. BUG=angleproject:1541 Change-Id: Ic993eeadb104989416607271ce100b02aea7cecc Reviewed-on: https://chromium-review.googlesource.com/603087Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>

Skip TimerQueriesTest.TimeElapsedMulticontextTest on all AMD
188fd5f6 · Yuly Novikov · Commit Bot · 90d874fc · 188fd5f6
Commit 188fd5f6 authored Aug 04, 2017 by Yuly Novikov Committed by Commit Bot Aug 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 11 deletions

TimerQueriesTest.cpp src/tests/gl_tests/TimerQueriesTest.cpp +3 -11

No files found.
--- a/src/tests/gl_tests/TimerQueriesTest.cpp
+++ b/src/tests/gl_tests/TimerQueriesTest.cpp
@@ -312,19 +312,11 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest)
 // Tests timer queries operating under multiple EGL contexts with mid-query switching
 TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
 {
-    if (IsAMD() && IsOpenGL() && IsWindows())
+    if (IsAMD() && IsOpenGL())
    {
-        // TODO(jmadill): Figure out why this test is flaky on Win/AMD/OpenGL.
+        // TODO(jmadill): Figure out why this test is flaky on AMD/OpenGL.
        // http://anglebug.com/1541
-        std::cout << "Test skipped on Windows AMD OpenGL Debug." << std::endl;
+        std::cout << "Test skipped on AMD OpenGL." << std::endl;
-        return;
-    }
-    if (IsAMD() && IsOSX())
-    {
-        // TODO(cwallez): Figure out why this test is flaky on OSX/AMD.
-        // http://anglebug.com/1866
-        std::cout << "Test skipped on Mac AMD." << std::endl;
        return;
    }