Fix TSAN suppressions for non-joinable ThreadTest.

base/threading/thread_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/threading/thread.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 136 matching lines @@
   EXPECT_TRUE(a.message_loop());
   EXPECT_TRUE(a.IsRunning());
 
   base::WaitableEvent event(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                             base::WaitableEvent::InitialState::NOT_SIGNALED);
   a.task_runner()->PostTask(FROM_HERE, base::Bind(&base::WaitableEvent::Signal,
                                                   base::Unretained(&event)));
   event.Wait();
 }
 
+// Intentional test-only race for otherwise untestable code, won't fix.
+// https://crbug.com/634383
+#if !defined(THREAD_SANITIZER)
 TEST_F(ThreadTest, StartWithOptions_NonJoinable) {
   Thread* a = new Thread("StartNonJoinable");
   // Non-joinable threads have to be leaked for now (see
   // Thread::Options::joinable for details).
   ANNOTATE_LEAKING_OBJECT_PTR(a);
 
   Thread::Options options;
   options.joinable = false;
   EXPECT_TRUE(a->StartWithOptions(options));
   EXPECT_TRUE(a->message_loop());
@@ skipping 19 matching lines @@
   a->StopSoon();
   EXPECT_TRUE(a->IsRunning());
 
   // Unblock the task and give a bit of extra time to unwind QuitWhenIdle().
   block_event.Signal();
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20));
 
   // The thread should now have stopped on its own.
   EXPECT_FALSE(a->IsRunning());
 }
+#endif
 
 TEST_F(ThreadTest, TwoTasksOnJoinableThread) {
   bool was_invoked = false;
   {
     Thread a("TwoTasksOnJoinableThread");
     EXPECT_TRUE(a.Start());
     EXPECT_TRUE(a.message_loop());
 
     // Test that all events are dispatched before the Thread object is
     // destroyed.  We do this by dispatching a sleep event before the
@@ skipping 75 matching lines @@
 
   EXPECT_TRUE(a.Start());
   EXPECT_TRUE(a.message_loop());
   EXPECT_TRUE(a.IsRunning());
 
   a.Stop();
   EXPECT_FALSE(a.message_loop());
   EXPECT_FALSE(a.IsRunning());
 }
 
+// Intentional test-only race for otherwise untestable code, won't fix.
+// https://crbug.com/634383
+#if !defined(THREAD_SANITIZER)
 TEST_F(ThreadTest, StartTwiceNonJoinableNotAllowed) {
+  LOG(ERROR) << __FUNCTION__;

[gab, 2016/08/08 21:09:51]

Leftover debug code?

   Thread* a = new Thread("StartTwiceNonJoinable");
   // Non-joinable threads have to be leaked for now (see
   // Thread::Options::joinable for details).
   ANNOTATE_LEAKING_OBJECT_PTR(a);
 
   Thread::Options options;
   options.joinable = false;
   EXPECT_TRUE(a->StartWithOptions(options));
   EXPECT_TRUE(a->message_loop());
   EXPECT_TRUE(a->IsRunning());
@@ skipping 14 matching lines @@
   last_task_event.Wait();
   base::PlatformThread::Sleep(base::TimeDelta::FromMilliseconds(20));
 
   // This test assumes that the above was sufficient to let the thread fully
   // stop.
   ASSERT_FALSE(a->IsRunning());
 
   // Restarting it should not be allowed.
   EXPECT_DCHECK_DEATH(a->Start());
 }
+#endif
 
 TEST_F(ThreadTest, ThreadName) {
   Thread a("ThreadName");
   EXPECT_TRUE(a.Start());
   EXPECT_EQ("ThreadName", a.thread_name());
 }
 
 TEST_F(ThreadTest, ThreadId) {
   Thread a("ThreadId0");
   Thread b("ThreadId1");
@@ skipping 128 matching lines @@
 
   a.Stop();
   EXPECT_FALSE(a.message_loop());
   EXPECT_FALSE(a.IsRunning());
 
   // Confirm that running any remaining tasks posted from Stop() goes smoothly
   // (e.g. https://codereview.chromium.org/2135413003/#ps300001 crashed if
   // StopSoon() posted Thread::ThreadQuitHelper() while |run_loop_| was null).
   base::RunLoop().RunUntilIdle();
 }