From 306efadffab8e9dbd494f02d75c78c46ee95689f Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 13 Jan 2016 07:51:28 -0800 Subject: [PATCH] Disable WebRtcVideoChannel2BaseTest.SendManyResizeOnce for TSan BUG=webrtc:4963 TBR=pbos@webrtc.org NOTRY=True Review URL: https://codereview.webrtc.org/1577233005 Cr-Commit-Position: refs/heads/master@{#11237} --- talk/media/webrtc/webrtcvideoengine2_unittest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/talk/media/webrtc/webrtcvideoengine2_unittest.cc b/talk/media/webrtc/webrtcvideoengine2_unittest.cc index 6aca2341fc..41e04a9fa7 100644 --- a/talk/media/webrtc/webrtcvideoengine2_unittest.cc +++ b/talk/media/webrtc/webrtcvideoengine2_unittest.cc @@ -864,7 +864,10 @@ TEST_F(WebRtcVideoChannel2BaseTest, TwoStreamsReUseFirstStream) { Base::TwoStreamsReUseFirstStream(kVp8Codec); } +//Disabled for TSan: https://bugs.chromium.org/p/webrtc/issues/detail?id=4963 +#if !defined(THREAD_SANITIZER) WEBRTC_BASE_TEST(SendManyResizeOnce); +#endif // THREAD_SANITIZER // TODO(pbos): Enable and figure out why this fails (or should work). TEST_F(WebRtcVideoChannel2BaseTest, DISABLED_SendVp8HdAndReceiveAdaptedVp8Vga) {