From f8c16b8bf4611b16f2674c8b4f8ef9a837dbd38a Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Thu, 29 Aug 2013 09:47:18 +0000 Subject: [PATCH] Disabling CondVarTest for TSan v2 (take 2) This test goes into an eternal loop sometimes when run under TSan v2, therefore I'm disabling it until this is resolved. Doing that, the TSan v2 bot in our new WebRTC FYI waterfall at http://build.chromium.org/p/client.webrtc.fyi/waterfall will hopefully go green. The define used only exists for TSan v2, so v1 should be unaffected. The suppression added in http://review.webrtc.org/2126005/ turns out actually has no effect, so I'm removing it again. It's probably useless since TSan v2 obviously alters the code's behavior, causing these errors. Since the errors are not TSan v2 failures, the suppression has no effect. BUG=2259 TEST=test passing locally when run as described in 2259 (since no tests are run). R=tommi@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2115005 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4639 4adac7df-926f-26a2-2b94-8c16560cd09d --- tools/valgrind-webrtc/tsan_v2/suppressions.txt | 3 --- .../system_wrappers/source/condition_variable_unittest.cc | 6 ++++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/valgrind-webrtc/tsan_v2/suppressions.txt b/tools/valgrind-webrtc/tsan_v2/suppressions.txt index 4d428be34..c6ed649b2 100644 --- a/tools/valgrind-webrtc/tsan_v2/suppressions.txt +++ b/tools/valgrind-webrtc/tsan_v2/suppressions.txt @@ -1,6 +1,3 @@ # False positive in system wrappers. # See https://code.google.com/p/webrtc/issues/detail?id=300 for details. race:webrtc/system_wrappers/source/thread_posix.cc - -# https://code.google.com/p/webrtc/issues/detail?id=2259 -race:condition_variable_unittest diff --git a/webrtc/system_wrappers/source/condition_variable_unittest.cc b/webrtc/system_wrappers/source/condition_variable_unittest.cc index 0d287b71b..48057fc08 100644 --- a/webrtc/system_wrappers/source/condition_variable_unittest.cc +++ b/webrtc/system_wrappers/source/condition_variable_unittest.cc @@ -175,6 +175,10 @@ class CondVarTest : public ::testing::Test { ThreadWrapper* thread_; }; +// Disable for TSan v2, see +// https://code.google.com/p/webrtc/issues/detail?id=2259 for details. +#if !defined(THREAD_SANITIZER) + // The SetUp and TearDown functions use condition variables. // This test verifies those pieces in isolation. TEST_F(CondVarTest, InitFunctionsWork) { @@ -191,6 +195,8 @@ TEST_F(CondVarTest, PassBatonMultipleTimes) { EXPECT_EQ(2 * kNumberOfRounds, baton_.PassCount()); } +#endif // if !defined(THREAD_SANITIZER) + } // anonymous namespace } // namespace webrtc