aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkjellander <kjellander@webrtc.org>2016-01-13 07:51:28 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-13 15:51:32 +0000
commit306efadffab8e9dbd494f02d75c78c46ee95689f (patch)
treeb688c81146836adce1d65057bebe8335228e7514
parent292e192f17b5cf46a485cd497e92b6b11f492f7b (diff)
downloadwebrtc-306efadffab8e9dbd494f02d75c78c46ee95689f.tar.gz
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}
-rw-r--r--talk/media/webrtc/webrtcvideoengine2_unittest.cc3
1 files changed, 3 insertions, 0 deletions
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) {