Commit cde6bdf6 authored by Weiliang Chen's avatar Weiliang Chen Committed by Commit Bot

Skip GL unit tests that are failing for MSAN

Skip GLImageNativePixmap tests and GLSurfaceEGLTest.SurfaceFormatTest
for MSAN.

TBR=kbr

Bug: 886995
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I1b29243bd8219e81187aa0e8c5d8f50371423126
Reviewed-on: https://chromium-review.googlesource.com/1236833
Commit-Queue: weiliangc <weiliangc@chromium.org>
Reviewed-by: default avatarweiliangc <weiliangc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592831}
parent 420e9a82
...@@ -107,6 +107,8 @@ using GLImageTestTypes = testing::Types< ...@@ -107,6 +107,8 @@ using GLImageTestTypes = testing::Types<
GLImageNativePixmapTestDelegate<gfx::BufferFormat::BGRX_8888>, GLImageNativePixmapTestDelegate<gfx::BufferFormat::BGRX_8888>,
GLImageNativePixmapTestDelegate<gfx::BufferFormat::BGRA_8888>>; GLImageNativePixmapTestDelegate<gfx::BufferFormat::BGRA_8888>>;
#if !defined(MEMORY_SANITIZER)
// Fails under MSAN: crbug.com/886995
INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap, INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap,
GLImageTest, GLImageTest,
GLImageTestTypes); GLImageTestTypes);
...@@ -118,6 +120,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap, ...@@ -118,6 +120,7 @@ INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap,
INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap, INSTANTIATE_TYPED_TEST_CASE_P(GLImageNativePixmap,
GLImageNativePixmapToDmabufTest, GLImageNativePixmapToDmabufTest,
GLImageTestTypes); GLImageTestTypes);
#endif
} // namespace } // namespace
......
...@@ -23,6 +23,8 @@ namespace { ...@@ -23,6 +23,8 @@ namespace {
class GLSurfaceEGLTest : public testing::Test {}; class GLSurfaceEGLTest : public testing::Test {};
#if !defined(MEMORY_SANITIZER)
// Fails under MSAN: crbug.com/886995
TEST(GLSurfaceEGLTest, SurfaceFormatTest) { TEST(GLSurfaceEGLTest, SurfaceFormatTest) {
GLSurfaceTestSupport::InitializeOneOffImplementation( GLSurfaceTestSupport::InitializeOneOffImplementation(
GLImplementation::kGLImplementationEGLGLES2, true); GLImplementation::kGLImplementationEGLGLES2, true);
...@@ -46,6 +48,7 @@ TEST(GLSurfaceEGLTest, SurfaceFormatTest) { ...@@ -46,6 +48,7 @@ TEST(GLSurfaceEGLTest, SurfaceFormatTest) {
eglGetConfigAttrib(surface->GetDisplay(), config, EGL_SAMPLES, &attrib); eglGetConfigAttrib(surface->GetDisplay(), config, EGL_SAMPLES, &attrib);
EXPECT_EQ(0, attrib); EXPECT_EQ(0, attrib);
} }
#endif
#if defined(OS_WIN) #if defined(OS_WIN)
......
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