diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index 201052af13..47fcc2b074 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 85a87239be..e1c86b2feb 100644 --- a/tools/valgrind-webrtc/tsan/suppressions.txt +++ b/tools/valgrind-webrtc/tsan/suppressions.txt @@ -38,15 +38,6 @@ 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