From e7009f3b0da59188af92d0579217b909d082623a Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 16 Oct 2013 12:26:48 +0000 Subject: [PATCH] Revert "Disable tests for TSan v2" This reverts r4787 since r4966 got us a newer Clang version with these issues fixed. BUG=2259,2334 TEST=test_support_unittests and system_wrappers_unittests passed execution under TSan v2 for 100 iterations: GYP_DEFINES='tsan=1 linux_use_tcmalloc=0 release_extra_cflags="-gline-tables-only"' gclient runhooks ninja -C out/Release test_support_unittests system_wrappers_unittests TSAN_OPTIONS="suppressions=tools/valgrind-webrtc/tsan_v2/suppressions.txt print_suppressions=1 report_signal_unsafe=0 report_thread_leaks=0 history_size=7" out/Release/system_wrappers_unittests --gtest_repeat=100 --gtest_break_on_failure TSAN_OPTIONS="suppressions=tools/valgrind-webrtc/tsan_v2/suppressions.txt print_suppressions=1 report_signal_unsafe=0 report_thread_leaks=0 history_size=7" out/Release/test_support_unittests --gtest_repeat=100 --gtest_break_on_failure R=hta@webrtc.org, perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2407004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4974 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 deletions(-) diff --git a/webrtc/system_wrappers/source/thread_unittest.cc b/webrtc/system_wrappers/source/thread_unittest.cc index d37f45b5eb..25095e6599 100644 --- a/webrtc/system_wrappers/source/thread_unittest.cc +++ b/webrtc/system_wrappers/source/thread_unittest.cc @@ -20,10 +20,6 @@ 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; @@ -54,6 +50,4 @@ 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 eccd8ea026..d8e66b9395 100644 --- a/webrtc/test/channel_transport/udp_socket_manager_unittest.cc +++ b/webrtc/test/channel_transport/udp_socket_manager_unittest.cc @@ -23,10 +23,6 @@ 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; @@ -84,7 +80,5 @@ 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 8ed204a28e..5ccc9ef2b8 100644 --- a/webrtc/test/channel_transport/udp_transport_unittest.cc +++ b/webrtc/test/channel_transport/udp_transport_unittest.cc @@ -108,10 +108,6 @@ 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; @@ -119,8 +115,6 @@ 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;