From 5ed4f46af15f05368266dc199d821f19a43a51f5 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 16 Oct 2013 10:50:41 +0000 Subject: [PATCH] Remove TSan v2 disabled test in condition_variable_unittest.cc When we rolled our chromium_revision 226126:228675 in r4966 we picked up Clang r191856, which fixes the problem we've seen earlier in condition_variable_unittest.cc. Because of this, I'm now re-enabling this test. TEST=trybots passing BUG=2259 R=hta@webrtc.org, perkj@webrtc.org Review URL: https://webrtc-codereview.appspot.com/2404004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4971 4adac7df-926f-26a2-2b94-8c16560cd09d --- .../system_wrappers/source/condition_variable_unittest.cc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/webrtc/system_wrappers/source/condition_variable_unittest.cc b/webrtc/system_wrappers/source/condition_variable_unittest.cc index 48057fc086..0d287b71b8 100644 --- a/webrtc/system_wrappers/source/condition_variable_unittest.cc +++ b/webrtc/system_wrappers/source/condition_variable_unittest.cc @@ -175,10 +175,6 @@ 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) { @@ -195,8 +191,6 @@ TEST_F(CondVarTest, PassBatonMultipleTimes) { EXPECT_EQ(2 * kNumberOfRounds, baton_.PassCount()); } -#endif // if !defined(THREAD_SANITIZER) - } // anonymous namespace } // namespace webrtc