From eda682339771f436edb629c7a096918a97f73711 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Tue, 14 Jan 2014 22:15:09 +0000 Subject: [PATCH] Re-enable webrtcvoice/videoengine unittests. TEST=try bots BUG= R=mallinath@webrtc.org Review URL: https://webrtc-codereview.appspot.com/7149004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@5387 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle_tests.gyp | 4 ++-- tools/valgrind-webrtc/tsan/suppressions.txt | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) 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/tsan/suppressions.txt b/tools/valgrind-webrtc/tsan/suppressions.txt index e1c86b2fe..85a87239b 100644 --- a/tools/valgrind-webrtc/tsan/suppressions.txt +++ b/tools/valgrind-webrtc/tsan/suppressions.txt @@ -38,6 +38,15 @@ fun:webrtc::Trace::set_level_filter ... } +{ + 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