From d8a9b8667125d3b7632aaabd575d18a3cf77282e Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 19 Sep 2013 07:15:36 +0000 Subject: [PATCH] Disable tests for TSan v2 These are tests that fail and that I haven't been able to suppress. I assume they're caused by the same bug in TSan v2 as described in webrtc:2259. BUG=2259,2334 TEST=Ran the tests similar to the instructions in the bugs, passed 100 iterations. R=andrew@webrtc.org, hta@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2250004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4787 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/system_wrappers/source/thread_unittest.cc | 6 ++++++ .../test/channel_transport/udp_socket_manager_unittest.cc | 6 ++++++ webrtc/test/channel_transport/udp_transport_unittest.cc | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/webrtc/system_wrappers/source/thread_unittest.cc b/webrtc/system_wrappers/source/thread_unittest.cc index 25095e6599..d37f45b5eb 100644 --- a/webrtc/system_wrappers/source/thread_unittest.cc +++ b/webrtc/system_wrappers/source/thread_unittest.cc @@ -20,6 +20,10 @@ bool NullRunFunction(void* obj) { return true; } +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=2259 for details. +#if !defined(THREAD_SANITIZER) + TEST(ThreadTest, StartStop) { ThreadWrapper* thread = ThreadWrapper::CreateThread(&NullRunFunction, NULL); unsigned int id = 42; @@ -50,4 +54,6 @@ TEST(ThreadTest, RunFunctionIsCalled) { delete thread; } +#endif // if !defined(THREAD_SANITIZER) + } // namespace webrtc diff --git a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc index d8e66b9395..eccd8ea026 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc @@ -23,6 +23,10 @@ namespace webrtc { namespace test { +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=2334 for details. +#if !defined(THREAD_SANITIZER) + TEST(UdpSocketManager, CreateCallsInitAndDoesNotLeakMemory) { int32_t id = 42; uint8_t threads = 1; @@ -80,5 +84,7 @@ TEST(UdpSocketManager, UnremovedSocketsGetCollectedAtManagerDeletion) { #endif } +#endif // if !defined(THREAD_SANITIZER) + } // namespace test } // namespace webrtc diff --git a/webrtc/test/channel_transport/udp_transport_unittest.cc b/webrtc/test/channel_transport/udp_transport_unittest.cc index 5ccc9ef2b8..8ed204a28e 100644 --- a/webrtc/test/channel_transport/udp_transport_unittest.cc +++ b/webrtc/test/channel_transport/udp_transport_unittest.cc @@ -108,6 +108,10 @@ private: std::vector sockets_created_; }; +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=2334 for details. +#if !defined(THREAD_SANITIZER) + TEST_F(UDPTransportTest, CreateTransport) { int32_t id = 0; uint8_t threads = 1; @@ -115,6 +119,8 @@ TEST_F(UDPTransportTest, CreateTransport) { UdpTransport::Destroy(transport); } +#endif // if !defined(THREAD_SANITIZER) + // This test verifies that the mock_socket is not called from the constructor. TEST_F(UDPTransportTest, ConstructorDoesNotCreateSocket) { int32_t id = 0;