From b050cf9903ba501d28ae16c087a367762d17e978 Mon Sep 17 00:00:00 2001 From: danilchap Date: Tue, 28 Feb 2017 10:12:29 -0800 Subject: [PATCH] Disable ViEEncoderTest.InitialFrameDropOffWhenEncoderDisabledScaling on tsan BUG=webrtc:7260 TBR=magjed@webrtc.org NOTRY=true Review-Url: https://codereview.webrtc.org/2722863002 Cr-Commit-Position: refs/heads/master@{#16919} --- webrtc/video/vie_encoder_unittest.cc | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/webrtc/video/vie_encoder_unittest.cc b/webrtc/video/vie_encoder_unittest.cc index 2c5609756d..823df77b0c 100644 --- a/webrtc/video/vie_encoder_unittest.cc +++ b/webrtc/video/vie_encoder_unittest.cc @@ -1188,7 +1188,15 @@ TEST_F(ViEEncoderTest, InitialFrameDropOffWithMaintainResolutionPreference) { vie_encoder_->Stop(); } -TEST_F(ViEEncoderTest, InitialFrameDropOffWhenEncoderDisabledScaling) { +// Disable for TSan v2, see https://crbug.com/webrtc/7260 for details. +#if defined(THREAD_SANITIZER) +#define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \ + DISABLED_InitialFrameDropOffWhenEncoderDisabledScaling +#else +#define MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling \ + InitialFrameDropOffWhenEncoderDisabledScaling +#endif +TEST_F(ViEEncoderTest, MAYBE_InitialFrameDropOffWhenEncoderDisabledScaling) { int frame_width = 640; int frame_height = 360; fake_encoder_.SetQualityScaling(false);