commit 8f19cb9fbc63e506155216f3f21619d9eed9f4b1
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 14 22:31:11 2014
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 14 22:31:11 2014
tree d2d3271fd8bc45358582ddc41f3fa6713b34050c
parent eda682339771f436edb629c7a096918a97f73711

Revert 5387 "Re-enable webrtcvoice/videoengine unittests."

Missed the result from the last try bot.

> Re-enable webrtcvoice/videoengine unittests.
> 
> TEST=try bots
> BUG=
> R=mallinath@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/7149004

TBR=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5388 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/libjingle_tests.gyp

diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp
index 201052a..47fcc2b 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"', {

tools/valgrind-webrtc/tsan/suppressions.txt

diff --git a/tools/valgrind-webrtc/tsan/suppressions.txt b/tools/valgrind-webrtc/tsan/suppressions.txt
index 85a8723..e1c86b2 100644
--- a/tools/valgrind-webrtc/tsan/suppressions.txt
+++ b/tools/valgrind-webrtc/tsan/suppressions.txt
@@ -39,15 +39,6 @@
   ...
 }
 {
-  Trace function
-  ThreadSanitizer:Race
-  fun:webrtc::TraceImpl::WriteToFile
-  fun:webrtc::TraceImpl::Process
-  fun:webrtc::TraceImpl::Run
-  fun:webrtc::ThreadPosix::Run
-  fun:StartThread
-}
-{
   Test posix socket HasIncoming
   ThreadSanitizer:Race
   fun:webrtc::test::UdpSocketPosix::HasIncoming