From ca5ff9972eab395ca14fbee8b529c2106033e7ba Mon Sep 17 00:00:00 2001
From: "wu@webrtc.org" <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Fri, 24 Jan 2014 17:37:46 +0000
Subject: [PATCH] Re-enable webrtcvoice/videoengine unittests.

TEST=try bots
BUG=
R=mallinath@webrtc.org

Committed: https://code.google.com/p/webrtc/source/detail?r=5387

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5427 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 talk/libjingle_tests.gyp                       |  4 ++--
 .../libjingle_media_unittest.gtest-tsan.txt    |  3 +++
 tools/valgrind-webrtc/tsan/suppressions.txt    | 18 ++++++++++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt

diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index 47fcc2b07..201052af1 100755
--- a/talk/libjingle_tests.gyp
+++ b/talk/libjingle_tests.gyp
@@ -288,8 +288,8 @@
         # Disabled because some tests fail.
         # TODO(ronghuawu): Reenable these tests.
         # 'media/devices/devicemanager_unittest.cc',
-        # 'media/webrtc/webrtcvideoengine_unittest.cc',
-        # 'media/webrtc/webrtcvoiceengine_unittest.cc',
+        'media/webrtc/webrtcvideoengine_unittest.cc',
+        'media/webrtc/webrtcvoiceengine_unittest.cc',
       ],
       'conditions': [
         ['OS=="win"', {
diff --git a/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt
new file mode 100644
index 000000000..ae525948f
--- /dev/null
+++ b/tools/valgrind-webrtc/gtest_exclude/libjingle_media_unittest.gtest-tsan.txt
@@ -0,0 +1,3 @@
+TODO(wu): issue 2380
+WebRtcVideoMediaChannelTest.TwoStreamsSendAndReceive
+WebRtcVideoMediaChannelTest.TwoStreamsReUseFirstStream
diff --git a/tools/valgrind-webrtc/tsan/suppressions.txt b/tools/valgrind-webrtc/tsan/suppressions.txt
index e1c86b2fe..0d7ca7f7c 100644
--- a/tools/valgrind-webrtc/tsan/suppressions.txt
+++ b/tools/valgrind-webrtc/tsan/suppressions.txt
@@ -38,6 +38,24 @@
   fun:webrtc::Trace::set_level_filter
   ...
 }
+{
+  Trace related 1
+  ThreadSanitizer:Race
+  fun:webrtc::TraceImpl::WriteToFile
+  fun:webrtc::TraceImpl::Process
+  fun:webrtc::TraceImpl::Run
+  fun:webrtc::ThreadPosix::Run
+  fun:StartThread
+}
+{
+  Trace related 2
+  ThreadSanitizer:Race
+  fun:cricket::WebRtcVideoEngine::~WebRtcVideoEngine
+  fun:VideoEngineOverride::~VideoEngineOverride
+  fun:VideoMediaChannelTest::~VideoMediaChannelTest
+  fun:WebRtcVideoMediaChannelTest::~WebRtcVideoMediaChannelTest
+  ...
+}
 {
   Test posix socket HasIncoming
   ThreadSanitizer:Race