Skip to content

A
angle
Commit 7bd8bd9f by Jamie Madill Committed by Commit Bot
Options

Skip PBO test on TSAN.

Texture2DTest.TexStorageWithPBO/ES2_OpenGL is flaky. Bug: b/168744561 Bug: angleproject:5097 Change-Id: Ide9b5a7d22e86c6eccd83ebc3bce6797b90150a6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2430163 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarYuly Novikov <ynovikov@chromium.org>
parent 54dbd5e7
Showing with 13 additions and 0 deletions
src/tests/gl_tests/TextureTest.cpp
...@@ -2139,6 +2139,9 @@ TEST_P(Texture2DTest, TexStorageWithPBO) ...@@ -2139,6 +2139,9 @@ TEST_P(Texture2DTest, TexStorageWithPBO)
// http://anglebug.com/5081 // http://anglebug.com/5081
ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsOpenGL()); ANGLE_SKIP_TEST_IF(IsWindows() && IsNVIDIA() && IsOpenGL());
// http://anglebug.com/5097
ANGLE_SKIP_TEST_IF(IsLinux() && IsOpenGL() && IsTSan());
if (getClientMajorVersion() < 3) if (getClientMajorVersion() < 3)
{ {
ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage")); ANGLE_SKIP_TEST_IF(!IsGLExtensionEnabled("GL_EXT_texture_storage"));
......
src/tests/test_utils/angle_test_instantiate.h
...@@ -47,6 +47,7 @@ bool IsARM64(); ...@@ -47,6 +47,7 @@ bool IsARM64();
// GPU devices. // GPU devices.
bool IsSwiftshaderDevice(); bool IsSwiftshaderDevice();
// Compiler configs.
inline bool IsASan() inline bool IsASan()
{ {
#if defined(ANGLE_WITH_ASAN) #if defined(ANGLE_WITH_ASAN)
...@@ -56,6 +57,15 @@ inline bool IsASan() ...@@ -56,6 +57,15 @@ inline bool IsASan()
#endif // defined(ANGLE_WITH_ASAN) #endif // defined(ANGLE_WITH_ASAN)
} }
inline bool IsTSan()
{
#if defined(THREAD_SANITIZER)
return true;
#else
return false;
#endif // defined(THREAD_SANITIZER)
}
bool IsPlatformAvailable(const PlatformParameters &param); bool IsPlatformAvailable(const PlatformParameters &param);
// This functions is used to filter which tests should be registered, // This functions is used to filter which tests should be registered,
......
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