Commit 3e8889d3 authored by Joe Downing's avatar Joe Downing Committed by Commit Bot

Disabling GLOutputSurfaceBufferQueueTest.BindFramebufferAndSwap on Linux MSAN

The original change had been reverted/relanded several times so I
decided to just disable this test since it doesn't appear to be causing
problems on other bots.  That will save the author another revert/reland
cycle.

TBR: andrescj@chromium.org
Bug: 1045602
Change-Id: I75cde759769f1bbd399992d17f778736bbd03163
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2020803Reviewed-by: default avatarJoe Downing <joedow@chromium.org>
Reviewed-by: default avatarAndres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Joe Downing <joedow@chromium.org>
Cr-Commit-Position: refs/heads/master@{#735133}
parent 536540ec
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
#include "components/viz/service/display_embedder/gl_output_surface_buffer_queue.h" #include "components/viz/service/display_embedder/gl_output_surface_buffer_queue.h"
#include "build/build_config.h"
#include "components/viz/service/display/output_surface_frame.h" #include "components/viz/service/display/output_surface_frame.h"
#include "components/viz/service/display_embedder/buffer_queue.h" #include "components/viz/service/display_embedder/buffer_queue.h"
#include "components/viz/test/test_context_provider.h" #include "components/viz/test/test_context_provider.h"
...@@ -110,7 +111,13 @@ MATCHER_P(SharedImageEqualTo, expected_shared_image, "") { ...@@ -110,7 +111,13 @@ MATCHER_P(SharedImageEqualTo, expected_shared_image, "") {
// Make sure that the surface uses the buffer queue and the GL context correctly // Make sure that the surface uses the buffer queue and the GL context correctly
// when we request it to bind the framebuffer twice and then swap the buffer. // when we request it to bind the framebuffer twice and then swap the buffer.
TEST_F(GLOutputSurfaceBufferQueueTest, BindFramebufferAndSwap) { #if defined(OS_LINUX) && defined(MEMORY_SANITIZER)
// TODO(http://crbug.com/1045602): fails on Linux MSAN.
#define MAYBE_BindFramebufferAndSwap DISABLED_BindFramebufferAndSwap
#else
#define MAYBE_BindFramebufferAndSwap BindFramebufferAndSwap
#endif
TEST_F(GLOutputSurfaceBufferQueueTest, MAYBE_BindFramebufferAndSwap) {
const gpu::SyncToken fake_sync_token( const gpu::SyncToken fake_sync_token(
gpu::CommandBufferNamespace::GPU_IO, gpu::CommandBufferNamespace::GPU_IO,
gpu::CommandBufferId::FromUnsafeValue(567u), gpu::CommandBufferId::FromUnsafeValue(567u),
......
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