Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2183)

Unified Diff: content/renderer/media/webrtc_local_audio_track_unittest.cc

Issue 478693003: [MemSheriff] Disable WebRtcLocalAudioTrackTest.ConnectTracksToDifferentCapturers to get tsan bot gr… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc_local_audio_track_unittest.cc
diff --git a/content/renderer/media/webrtc_local_audio_track_unittest.cc b/content/renderer/media/webrtc_local_audio_track_unittest.cc
index 3f542fb6e8beabf85747533ae6df6ab79105b2cb..6bdd034ad624becd1fcc33b48cdc9b23c5c9ff2f 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));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698