Commit 91db32c5 by Jamie Madill Committed by Commit Bot

Skip TimerQueriesTest.TimeElapsedMulticontextTest on Win/AMD/GL/Debug.

This test appears to be flaky. BUG=angleproject:1541 Change-Id: I2a91626f6dc309d2dc23098cbaf290adac7f4859 Reviewed-on: https://chromium-review.googlesource.com/394217Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
parent a015f59f
...@@ -311,6 +311,13 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest) ...@@ -311,6 +311,13 @@ TEST_P(TimerQueriesTest, TimeElapsedValidationTest)
// Tests timer queries operating under multiple EGL contexts with mid-query switching // Tests timer queries operating under multiple EGL contexts with mid-query switching
TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest) TEST_P(TimerQueriesTest, TimeElapsedMulticontextTest)
{ {
if (IsAMD() && IsOpenGL() && IsWindows() && IsDebug())
{
// TODO(jmadill): Figure out why this test is flaky on Win/AMD/OpenGL/Debug.
std::cout << "Test skipped on Windows AMD OpenGL Debug." << std::endl;
return;
}
if (!extensionEnabled("GL_EXT_disjoint_timer_query")) if (!extensionEnabled("GL_EXT_disjoint_timer_query"))
{ {
std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available." std::cout << "Test skipped because GL_EXT_disjoint_timer_query is not available."
......
...@@ -786,6 +786,20 @@ bool IsWindows() ...@@ -786,6 +786,20 @@ bool IsWindows()
#endif #endif
} }
bool IsDebug()
{
#if !defined(NDEBUG)
return true;
#else
return false;
#endif
}
bool IsRelease()
{
return !IsDebug();
}
EGLint ANGLETest::getPlatformRenderer() const EGLint ANGLETest::getPlatformRenderer() const
{ {
assert(mEGLWindow); assert(mEGLWindow);
......
...@@ -252,6 +252,10 @@ bool IsLinux(); ...@@ -252,6 +252,10 @@ bool IsLinux();
bool IsOSX(); bool IsOSX();
bool IsWindows(); bool IsWindows();
// Debug/Release
bool IsDebug();
bool IsRelease();
// Negative tests may trigger expected errors/warnings in the ANGLE Platform. // Negative tests may trigger expected errors/warnings in the ANGLE Platform.
void IgnoreANGLEPlatformMessages(); void IgnoreANGLEPlatformMessages();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment