summaryrefslogtreecommitdiffstats
path: root/base/stats_table_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-08 09:30:28 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-05-08 09:30:28 +0000
commit1946dd1a45100d0363a37bb484d6127f14d9cc79 (patch)
tree5d809adbd845e5b8d2063a3e4aab768b507b66c1 /base/stats_table_unittest.cc
parent33169161602b71e31d5a812eb729058b6b1dcb5c (diff)
downloadchromium_src-1946dd1a45100d0363a37bb484d6127f14d9cc79.zip
chromium_src-1946dd1a45100d0363a37bb484d6127f14d9cc79.tar.gz
chromium_src-1946dd1a45100d0363a37bb484d6127f14d9cc79.tar.bz2
Disable StatsTableTest.MultipleThreads
instead of using #if 0 (so that the code doesn't rot). This is http://codereview.chromium.org/1990007 done right, this time should not break tsan. TBR=maruel TEST=none BUG=10611 Review URL: http://codereview.chromium.org/2022003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46784 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/stats_table_unittest.cc')
-rw-r--r--base/stats_table_unittest.cc7
1 files changed, 2 insertions, 5 deletions
diff --git a/base/stats_table_unittest.cc b/base/stats_table_unittest.cc
index 0793351..f8fda0b 100644
--- a/base/stats_table_unittest.cc
+++ b/base/stats_table_unittest.cc
@@ -108,10 +108,8 @@ void StatsTableThread::Run() {
}
// Create a few threads and have them poke on their counters.
-// Currently disabled. See bug report below:
-// TODO(maruel): http://crbug.com/10611
-TEST_F(StatsTableTest, MultipleThreads) {
-#if 0
+// Disabled, http://crbug.com/10611.
+TEST_F(StatsTableTest, DISABLED_MultipleThreads) {
// Create a stats table.
const std::string kTableName = "MultipleThreadStatTable";
const int kMaxThreads = 20;
@@ -164,7 +162,6 @@ TEST_F(StatsTableTest, MultipleThreads) {
EXPECT_EQ(0, table.CountThreadsRegistered());
DeleteShmem(kTableName);
-#endif
}
const std::string kMPTableName = "MultipleProcessStatTable";