From 61b262c427d5747825d3582086786fab68d12a09 Mon Sep 17 00:00:00 2001
From: "henrike@webrtc.org"
 <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 22 Aug 2013 20:27:49 +0000
Subject: [PATCH] Disable tests according to issues: 1205,2272,2288,2290,2291

BUG=1205,2272,2288,2290,2291
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/2069005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4596 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/app/webrtc/peerconnection_unittest.cc            |  2 +-
 talk/base/macsocketserver_unittest.cc                 |  2 +-
 .../libjingle_peerconnection_unittest.gtest-tsan.txt  |  3 ++-
 tools/valgrind-webrtc/tsan/suppressions.txt           | 11 +++++++++++
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/talk/app/webrtc/peerconnection_unittest.cc b/talk/app/webrtc/peerconnection_unittest.cc
index 250e60f41..a1f30a49e 100644
--- a/talk/app/webrtc/peerconnection_unittest.cc
+++ b/talk/app/webrtc/peerconnection_unittest.cc
@@ -1095,7 +1095,7 @@ TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestAnswerVideo) {
 
 // This test sets up a Jsep call between two parties, and the callee only
 // accept to receive audio.
-TEST_F(JsepPeerConnectionP2PTestClient, LocalP2PTestAnswerAudio) {
+TEST_F(JsepPeerConnectionP2PTestClient, DISABLE_LocalP2PTestAnswerAudio) {
   ASSERT_TRUE(CreateTestClients());
   receiving_client()->SetReceiveAudioVideo(true, false);
   LocalP2PTest();
diff --git a/talk/base/macsocketserver_unittest.cc b/talk/base/macsocketserver_unittest.cc
index 07cce263c..1adbed0a7 100644
--- a/talk/base/macsocketserver_unittest.cc
+++ b/talk/base/macsocketserver_unittest.cc
@@ -132,7 +132,7 @@ TEST_F(MacAsyncSocketTest, TestConnectWithDnsLookupIPv6) {
   SocketTest::TestConnectWithDnsLookupIPv6();
 }
 
-TEST_F(MacAsyncSocketTest, TestConnectFailIPv4) {
+TEST_F(MacAsyncSocketTest, DISABLE_TestConnectFailIPv4) {
   SocketTest::TestConnectFailIPv4();
 }
 
diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-tsan.txt
index ee4be4deb..3cc711f23 100644
--- a/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-tsan.txt
+++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_peerconnection_unittest.gtest-tsan.txt
@@ -23,4 +23,5 @@ PeerConnectionInterfaceTest.DataChannelCloseWhenPeerConnectionClose
 PeerConnectionInterfaceTest.TestDataChannel
 PeerConnectionInterfaceTest.TestSendBinaryOnRtpDataChannel
 PeerConnectionInterfaceTest.TestSendOnlyDataChannel
-
+WebRtcSessionTest.TestRtpDataChannelConstraintTakesPrecedence
+WebRtcSessionTest.TestSctpDataChannelWithDtls
diff --git a/tools/valgrind-webrtc/tsan/suppressions.txt b/tools/valgrind-webrtc/tsan/suppressions.txt
index 98db4cb57..052042a3f 100644
--- a/tools/valgrind-webrtc/tsan/suppressions.txt
+++ b/tools/valgrind-webrtc/tsan/suppressions.txt
@@ -473,6 +473,17 @@
   fun:webrtc::VoEBaseImpl::StopSend
   ...
 }
+{
+  bug_1205_47
+  ThreadSanitizer:Race
+  fun:cricket::WebRtcDecoderObserver::IncomingRate
+  fun:webrtc::ViEChannel::OnReceiveStatisticsUpdate
+  fun:webrtc::VideoCodingModuleImpl::Process
+  fun:webrtc::ProcessThreadImpl::Process
+  fun:webrtc::ProcessThreadImpl::Run
+  fun:webrtc::ThreadPosix::Run
+  fun:StartThread
+}
 {
   bug_2078_1
   ThreadSanitizer:Race