From 8fb593047a83a3ced9802ad41ff4529e2dc31d1f Mon Sep 17 00:00:00 2001 From: svenpanne Date: Thu, 22 Jan 2015 02:23:49 -0800 Subject: [PATCH] Removed bogus threading test to make TSAN happy. TSAN hits an internal assertion on a self-join, and the test is not really that useful, so let's just remove it. BUG=https://code.google.com/p/thread-sanitizer/issues/detail?id=88 LOG=n Review URL: https://codereview.chromium.org/824243007 Cr-Commit-Position: refs/heads/master@{#26217} --- test/unittests/base/platform/platform-unittest.cc | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/test/unittests/base/platform/platform-unittest.cc b/test/unittests/base/platform/platform-unittest.cc index b17a9b9..8392b55 100644 --- a/test/unittests/base/platform/platform-unittest.cc +++ b/test/unittests/base/platform/platform-unittest.cc @@ -36,24 +36,6 @@ TEST(OS, GetCurrentProcessId) { namespace { -class SelfJoinThread FINAL : public Thread { - public: - SelfJoinThread() : Thread(Options("SelfJoinThread")) {} - void Run() FINAL { Join(); } -}; - -} // namespace - - -TEST(Thread, DISABLE_ON_ANDROID(SelfJoin)) { - SelfJoinThread thread; - thread.Start(); - thread.Join(); -} - - -namespace { - class ThreadLocalStorageTest : public Thread, public ::testing::Test { public: ThreadLocalStorageTest() : Thread(Options("ThreadLocalStorageTest")) { -- 2.7.4