Make sure ThreadSanitizer v2 reports a data race in ToolsSanityTest.DataRace.

base/tools_sanity_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.
 //
 // This file contains intentional memory errors, some of which may lead to
 // crashes if the test is ran without special memory testing tools. We use these
 // errors to verify the sanity of the tools.
 
 #include "base/atomicops.h"
 #include "base/debug/asan_invalid_access.h"
@@ skipping 269 matching lines @@
 
 void RunInParallel(PlatformThread::Delegate *d1, PlatformThread::Delegate *d2) {
   PlatformThreadHandle a;
   PlatformThreadHandle b;
   PlatformThread::Create(0, d1, &a);
   PlatformThread::Create(0, d2, &b);
   PlatformThread::Join(a);
   PlatformThread::Join(b);
 }
 
+void DataRace() {
+  bool *shared = new bool(false);
+  TOOLS_SANITY_TEST_CONCURRENT_THREAD thread1(shared), thread2(shared);
+  RunInParallel(&thread1, &thread2);
+  EXPECT_TRUE(*shared);
+  delete shared;
+#if defined(THREAD_SANITIZER)
+  // We're in a death test - crash.
+  CHECK(0);
+#endif
+}
+
 }  // namespace
 
 // A data race detector should report an error in this test.
 TEST(ToolsSanityTest, DataRace) {
-  bool *shared = new bool(false);
-  TOOLS_SANITY_TEST_CONCURRENT_THREAD thread1(shared), thread2(shared);
-  RunInParallel(&thread1, &thread2);
-  EXPECT_TRUE(*shared);
-  delete shared;
+#if defined(THREAD_SANITIZER)
+  // The suppression regexp must match that in base/debug/tsan_suppressions.cc.
+  EXPECT_DEATH(DataRace(), "1 race:base/tools_sanity_unittest.cc");
+#else
+  // TODO(glider): remove this path when TSan v1 is retired.

[Nico, 2014/06/25 16:10:22]

Isn't this done?

+  DataRace();
+#endif
 }
 
 TEST(ToolsSanityTest, AnnotateBenignRace) {
   bool shared = false;
   ANNOTATE_BENIGN_RACE(&shared, "Intentional race - make sure doesn't show up");
   TOOLS_SANITY_TEST_CONCURRENT_THREAD thread1(&shared), thread2(&shared);
   RunInParallel(&thread1, &thread2);
   EXPECT_TRUE(shared);
 }
 
 TEST(ToolsSanityTest, AtomicsAreIgnored) {
   base::subtle::Atomic32 shared = 0;
   ReleaseStoreThread thread1(&shared);
   AcquireLoadThread thread2(&shared);
   RunInParallel(&thread1, &thread2);
   EXPECT_EQ(kMagicValue, shared);
 }
 
 }  // namespace base