From 8f19cb9fbc63e506155216f3f21619d9eed9f4b1 Mon Sep 17 00:00:00 2001 From: "wu@webrtc.org" Date: Tue, 14 Jan 2014 22:31:11 +0000 Subject: [PATCH] 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 | 4 ++-- tools/valgrind-webrtc/tsan/suppressions.txt | 9 --------- 2 files changed, 2 insertions(+), 11 deletions(-) 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