base: Make SequenceChecker death tests multi-threads work correctly.

base/sequence_checker_unittest.cc

Index: base/sequence_checker_unittest.cc
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc
index e093fa86546983fe10976df80ffbad27d6163860..f2aaf7f6314709a6288d595ed332f7740dfb5f2a 100644
--- a/base/sequence_checker_unittest.cc
+++ b/base/sequence_checker_unittest.cc
@@ -196,6 +196,8 @@ void SequenceCheckerTest::MethodOnDifferentThreadDeathTest() {
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, MethodNotAllowedOnDifferentThreadDeathTestInDebug) {
+  // The default style "fast" does not support multi-threaded tests.
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";

[Reid Kleckner, 2013/07/19 16:23:00]

Do these get reset after each test?

[tommycli, 2013/07/19 16:59:57]

Yes, reset after each test.

[Timur Iskhodzhanov, 2013/07/19 19:22:07]

Why not put it into the fixture?

[tommycli, 2013/07/19 19:30:53]

No technical reason why it can't be in fixture. Just that all other death tests
that use this flag declare in body, not in fixture.

   ASSERT_DEATH({
     MethodOnDifferentThreadDeathTest();
   }, "");
@@ -223,6 +225,8 @@ void SequenceCheckerTest::DetachThenCallFromDifferentThreadDeathTest() {
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, DetachFromSequenceDeathTestInDebug) {
+  // The default style "fast" does not support multi-threaded tests.
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     DetachThenCallFromDifferentThreadDeathTest();
   }, "");
@@ -250,6 +254,8 @@ void SequenceCheckerTest::DifferentSequenceTokensDeathTest() {
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, DifferentSequenceTokensDeathTestInDebug) {
+  // The default style "fast" does not support multi-threaded tests.
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     DifferentSequenceTokensDeathTest();
   }, "");
@@ -276,6 +282,8 @@ void SequenceCheckerTest::WorkerPoolAndSimpleThreadDeathTest() {
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, WorkerPoolAndSimpleThreadDeathTestInDebug) {
+  // The default style "fast" does not support multi-threaded tests.
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     WorkerPoolAndSimpleThreadDeathTest();
   }, "");
@@ -308,6 +316,8 @@ void SequenceCheckerTest::TwoDifferentWorkerPoolsDeathTest() {
 
 #if ENABLE_SEQUENCE_CHECKER
 TEST_F(SequenceCheckerTest, TwoDifferentWorkerPoolsDeathTestInDebug) {
+  // The default style "fast" does not support multi-threaded tests.
+  ::testing::FLAGS_gtest_death_test_style = "threadsafe";
   ASSERT_DEATH({
     TwoDifferentWorkerPoolsDeathTest();
   }, "");