Commit 601a0ccc by Jamie Madill

Revert "Skip TimerQueriesTest.TimeElapsed on Win/AMD/GL/Debug."

The correct test was the multi-context version. BUG=angleproject:1541 This reverts commit d0614b85. Change-Id: I4f4a9e3b1e0301eef34ce8c06cd649bff66fcdb1 Reviewed-on: https://chromium-review.googlesource.com/394216Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent d0614b85
...@@ -112,13 +112,6 @@ TEST_P(TimerQueriesTest, TimeElapsed) ...@@ -112,13 +112,6 @@ TEST_P(TimerQueriesTest, TimeElapsed)
return; return;
} }
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;
}
GLint queryTimeElapsedBits = 0; GLint queryTimeElapsedBits = 0;
glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits); glGetQueryivEXT(GL_TIME_ELAPSED_EXT, GL_QUERY_COUNTER_BITS_EXT, &queryTimeElapsedBits);
ASSERT_GL_NO_ERROR(); ASSERT_GL_NO_ERROR();
......
...@@ -786,20 +786,6 @@ bool IsWindows() ...@@ -786,20 +786,6 @@ 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,10 +252,6 @@ bool IsLinux(); ...@@ -252,10 +252,6 @@ 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