diff options
| author | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 22:02:59 +0000 |
|---|---|---|
| committer | shess@chromium.org <shess@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-07 22:02:59 +0000 |
| commit | 45aabf3d4a30248626533da0416bd082a13a0364 (patch) | |
| tree | 112446afe655b13e97b0a66c71242fdde08c0eff /base/stats_table_unittest.cc | |
| parent | e7dd215464a368a2a0f4f4880dccf15597341064 (diff) | |
| download | chromium_src-45aabf3d4a30248626533da0416bd082a13a0364.zip chromium_src-45aabf3d4a30248626533da0416bd082a13a0364.tar.gz chromium_src-45aabf3d4a30248626533da0416bd082a13a0364.tar.bz2 | |
Revert StatsTableTest.MultipleThreads change which is failing tsan.
Revert r46707:
Mark StatsTableTest.MultipleThreads as flaky
instead of using #if 0.
TBR=maruel,phajdan.jr
TEST=none
BUG=10611
Review URL: http://codereview.chromium.org/2054003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46743 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/stats_table_unittest.cc')
| -rw-r--r-- | base/stats_table_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc index bb7dacd..0793351 100644 --- a/base/stats_table_unittest.cc +++ b/base/stats_table_unittest.cc @@ -109,8 +109,9 @@ void StatsTableThread::Run() { // Create a few threads and have them poke on their counters. // Currently disabled. See bug report below: -// Flaky, http://crbug.com/10611 -TEST_F(StatsTableTest, FLAKY_MultipleThreads) { +// TODO(maruel): http://crbug.com/10611 +TEST_F(StatsTableTest, MultipleThreads) { +#if 0 // Create a stats table. const std::string kTableName = "MultipleThreadStatTable"; const int kMaxThreads = 20; @@ -163,6 +164,7 @@ TEST_F(StatsTableTest, FLAKY_MultipleThreads) { EXPECT_EQ(0, table.CountThreadsRegistered()); DeleteShmem(kTableName); +#endif } const std::string kMPTableName = "MultipleProcessStatTable"; |