diff options
| author | bruening@chromium.org <bruening@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 18:31:49 +0000 |
|---|---|---|
| committer | bruening@chromium.org <bruening@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-15 18:31:49 +0000 |
| commit | a68d37c0b7bd142339f1c552896c9910d9f09ae4 (patch) | |
| tree | 347ac0c58763ee89ef221ea113ba5b2293e08685 /content | |
| parent | c49d9602481401bad1b6df02b9ace08e0ba31ca3 (diff) | |
| download | chromium_src-a68d37c0b7bd142339f1c552896c9910d9f09ae4.zip chromium_src-a68d37c0b7bd142339f1c552896c9910d9f09ae4.tar.gz chromium_src-a68d37c0b7bd142339f1c552896c9910d9f09ae4.tar.bz2 | |
[MemSheriff] Disable WebRtcLocalAudioTrackTest.ConnectTracksToDifferentCapturers to get tsan bot green.
BUG=404133
TBR=ajm@chromium.org
Review URL: https://codereview.chromium.org/478693003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@289947 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/renderer/media/webrtc_local_audio_track_unittest.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc index 3f542fb..6bdd034 100644 --- a/content/renderer/media/webrtc_local_audio_track_unittest.cc +++ b/content/renderer/media/webrtc_local_audio_track_unittest.cc @@ -404,8 +404,16 @@ TEST_F(WebRtcLocalAudioTrackTest, StartAndStopAudioTracks) { capturer_->Stop(); } +// Contains data races reported by tsan: crbug.com/404133 +#if defined(THREAD_SANITIZER) + #define DISABLE_ON_TSAN(function) DISABLED_##function +#else + #define DISABLE_ON_TSAN(function) function +#endif + // Create a new capturer with new source, connect it to a new audio track. -TEST_F(WebRtcLocalAudioTrackTest, ConnectTracksToDifferentCapturers) { +TEST_F(WebRtcLocalAudioTrackTest, + DISABLE_ON_TSAN(ConnectTracksToDifferentCapturers)) { // Setup the first audio track and start it. scoped_refptr<WebRtcLocalAudioTrackAdapter> adapter_1( WebRtcLocalAudioTrackAdapter::Create(std::string(), NULL)); |