diff options
| author | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 02:48:33 +0000 |
|---|---|---|
| committer | tommycli@chromium.org <tommycli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-20 02:48:33 +0000 |
| commit | 791bb3d1b6d47962b24de8b6e18c5f0a331c08d9 (patch) | |
| tree | 1a0052f14d9bc9751099db654aac536de7071a4c /base | |
| parent | bd88ec3c7dae1331ba1787e50e90b5334d269b81 (diff) | |
| download | chromium_src-791bb3d1b6d47962b24de8b6e18c5f0a331c08d9.zip chromium_src-791bb3d1b6d47962b24de8b6e18c5f0a331c08d9.tar.gz chromium_src-791bb3d1b6d47962b24de8b6e18c5f0a331c08d9.tar.bz2 | |
base: Make SequenceChecker death tests multi-threads work correctly.
TBR=akalin,darin
BUG=261141
Review URL: https://chromiumcodereview.appspot.com/19617002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/sequence_checker_unittest.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/base/sequence_checker_unittest.cc b/base/sequence_checker_unittest.cc index d6bd4fd..7df7614 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"; 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(); }, ""); |