summaryrefslogtreecommitdiffstats
path: root/base/metrics
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 22:28:22 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-25 22:28:22 +0000
commit2199f8d7f135ecb0b880ad64c65df889847e7373 (patch)
treeedc14ef24482f26d2bbb1f6c0ea9725f68fe039d /base/metrics
parent60c331a16cba4f5347f77df8d5e3907bc3f24ae0 (diff)
downloadchromium_src-2199f8d7f135ecb0b880ad64c65df889847e7373.zip
chromium_src-2199f8d7f135ecb0b880ad64c65df889847e7373.tar.gz
chromium_src-2199f8d7f135ecb0b880ad64c65df889847e7373.tar.bz2
Disable StatsTableTest.MultipleThreads on Mac.
It's failing on the Mac Valgrind bot TBR=thestig@chromium.org BUG=10611 TEST=NONE Review URL: http://codereview.chromium.org/9466039 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
-rw-r--r--base/metrics/stats_table_unittest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 2755ace..447769c 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -106,7 +106,13 @@ void StatsTableThread::Run() {
}
// Create a few threads and have them poke on their counters.
-TEST_F(StatsTableTest, MultipleThreads) {
+// See http://crbug.com/10611 for more information.
+#if defined(OS_MACOSX)
+#define MAYBE_MultipleThreads DISABLED_MultipleThreads
+#else
+#define MAYBE_MultipleThreads MultipleThreads
+#endif
+TEST_F(StatsTableTest, MAYBE_MultipleThreads) {
// Create a stats table.
const std::string kTableName = "MultipleThreadStatTable";
const int kMaxThreads = 20;