From 24485eb3cc7e2729613d9fa413e476ef91977871 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Mon, 2 Mar 2015 09:40:44 +0000 Subject: [PATCH] Remove last pieces of libjingle_unittest Most of this code has been moved into rtc_unittests a long time ago. The target is no longer executing on the bots. BUG= R=perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39319004 Cr-Commit-Position: refs/heads/master@{#8548} git-svn-id: http://webrtc.googlecode.com/svn/trunk@8548 4adac7df-926f-26a2-2b94-8c16560cd09d --- talk/libjingle_tests.gyp | 15 ----------- .../valgrind-webrtc/drmemory/suppressions.txt | 2 +- .../sanitizers/lsan_suppressions_webrtc.cc | 26 +++++++++---------- .../sanitizers/tsan_suppressions_webrtc.cc | 10 +++---- 4 files changed, 17 insertions(+), 36 deletions(-) diff --git a/talk/libjingle_tests.gyp b/talk/libjingle_tests.gyp index 7451bd7339..f7ffaeee77 100755 --- a/talk/libjingle_tests.gyp +++ b/talk/libjingle_tests.gyp @@ -68,21 +68,6 @@ 'media/webrtc/fakewebrtcvoiceengine.h', ], }, # target libjingle_unittest_main - { - 'target_name': 'libjingle_unittest', - 'type': 'executable', - 'includes': [ 'build/objc_app.gypi', ], - 'dependencies': [ - '<(webrtc_root)/base/base.gyp:rtc_base', - '<(webrtc_root)/base/base_tests.gyp:rtc_base_tests_utils', - '<(webrtc_root)/libjingle/xmllite/xmllite.gyp:rtc_xmllite', - 'libjingle.gyp:libjingle', - 'libjingle_unittest_main', - ], - 'sources': [ - '<(DEPTH)/webrtc/test/testsupport/always_passing_unittest.cc', - ], # sources - }, # target libjingle_unittest { 'target_name': 'libjingle_media_unittest', 'type': 'executable', diff --git a/tools/valgrind-webrtc/drmemory/suppressions.txt b/tools/valgrind-webrtc/drmemory/suppressions.txt index a582ef836d..0036a7f78a 100644 --- a/tools/valgrind-webrtc/drmemory/suppressions.txt +++ b/tools/valgrind-webrtc/drmemory/suppressions.txt @@ -177,7 +177,7 @@ name=https://code.google.com/p/webrtc/issues/detail?id=3158 (3) *!_threadstartex KERNEL32.dll!BaseThreadInitThunk -# libjingle_unittest, fails on Win DrMemory Full +# rtc_unittest, fails on Win DrMemory Full UNINITIALIZED READ name=https://code.google.com/p/webrtc/issues/detail?id=3158 (4) *!_towlower_l diff --git a/webrtc/build/sanitizers/lsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/lsan_suppressions_webrtc.cc index 0ae9fb38ef..6d19a34881 100644 --- a/webrtc/build/sanitizers/lsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/lsan_suppressions_webrtc.cc @@ -74,6 +74,18 @@ char kLSanDefaultSuppressions[] = "leak:rtc::HttpData::changeHeader\n" // https://code.google.com/p/webrtc/issues/detail?id=4149 for details. "leak:StartDNSLookup\n" +// https://code.google.com/p/webrtc/issues/detail?id=2527 +"leak:buzz::FakeXmppClient::SendStanza\n" +"leak:buzz::XmppTask::XmppTask\n" +"leak:HangoutPubSubClientTest::HangoutPubSubClientTest\n" +"leak:MucRoomConfigTaskTest::SetUp\n" +"leak:MucRoomDiscoveryTaskTest::SetUp\n" +"leak:MucRoomLookupTaskTest::SetUp\n" +"leak:MucRoomUniqueHangoutIdTaskTest::SetUp\n" +"leak:PingTaskTest::SetUp\n" +"leak:PingXmppClient::SendStanza\n" +"leak:PubSubClientTest::PubSubClientTest\n" +"leak:PubSubTasksTest::PubSubTasksTest\n" // libjingle_media_unittest "leak:cricket::FakeNetworkInterface::SetOption\n" @@ -109,20 +121,6 @@ char kLSanDefaultSuppressions[] = "leak:WebRtcSessionTest::SetLocalDescriptionExpectError\n" "leak:WebRtcSessionTest_TestAVOfferWithAudioOnlyAnswer_Test::TestBody\n" -// libjingle_unittest -// https://code.google.com/p/webrtc/issues/detail?id=2527 -"leak:buzz::FakeXmppClient::SendStanza\n" -"leak:buzz::XmppTask::XmppTask\n" -"leak:HangoutPubSubClientTest::HangoutPubSubClientTest\n" -"leak:MucRoomConfigTaskTest::SetUp\n" -"leak:MucRoomDiscoveryTaskTest::SetUp\n" -"leak:MucRoomLookupTaskTest::SetUp\n" -"leak:MucRoomUniqueHangoutIdTaskTest::SetUp\n" -"leak:PingTaskTest::SetUp\n" -"leak:PingXmppClient::SendStanza\n" -"leak:PubSubClientTest::PubSubClientTest\n" -"leak:PubSubTasksTest::PubSubTasksTest\n" - // PLEASE READ ABOVE BEFORE ADDING NEW SUPPRESSIONS. // End of suppressions. diff --git a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc index 0d6efd4843..4015803492 100644 --- a/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc +++ b/webrtc/build/sanitizers/tsan_suppressions_webrtc.cc @@ -47,6 +47,10 @@ char kTSanDefaultSuppressions[] = "race:rtc::FireAndForgetAsyncClosure::Execute\n" "race:rtc::MessageQueueManager::Clear\n" "race:rtc::Thread::Clear\n" +// https://code.google.com/p/webrtc/issues/detail?id=2080 +"race:webrtc/base/logging.cc\n" +"race:webrtc/base/sharedexclusivelock_unittest.cc\n" +"race:webrtc/base/signalthread_unittest.cc\n" // libjingle_p2p_unittest // https://code.google.com/p/webrtc/issues/detail?id=2079 @@ -54,12 +58,6 @@ char kTSanDefaultSuppressions[] = "race:webrtc/base/virtualsocketserver.cc\n" "race:talk/p2p/base/stunserver_unittest.cc\n" -// libjingle_unittest -// https://code.google.com/p/webrtc/issues/detail?id=2080 -"race:webrtc/base/logging.cc\n" -"race:webrtc/base/sharedexclusivelock_unittest.cc\n" -"race:webrtc/base/signalthread_unittest.cc\n" - // third_party/usrsctp // TODO(jiayl): https://code.google.com/p/webrtc/issues/detail?id=3492 "race:user_sctp_timer_iterate\n"