summaryrefslogtreecommitdiffstats
path: root/base/metrics
diff options
context:
space:
mode:
authorglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-01 15:48:17 +0000
committerglider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-01 15:48:17 +0000
commita1129f2eb6d0cb85284c427b09a4cb6fd5e4312e (patch)
tree3c67c4f3309ce2f6c24a942b521039975e04acfd /base/metrics
parent75f84e4df25742b4aecdf8f5e1c79b59d6e38832 (diff)
downloadchromium_src-a1129f2eb6d0cb85284c427b09a4cb6fd5e4312e.zip
chromium_src-a1129f2eb6d0cb85284c427b09a4cb6fd5e4312e.tar.gz
chromium_src-a1129f2eb6d0cb85284c427b09a4cb6fd5e4312e.tar.bz2
Disable StatsTableTest.MultipleThreads under ThreadSanitizer v2
BUG=10611 Review URL: https://codereview.chromium.org/13311002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@191613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/metrics')
-rw-r--r--base/metrics/stats_table_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 78d9fe6..713fff0 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -109,7 +109,7 @@ void StatsTableThread::Run() {
// Create a few threads and have them poke on their counters.
// See http://crbug.com/10611 for more information.
-#if defined(OS_MACOSX)
+#if defined(OS_MACOSX) || defined(THREAD_SANITIZER)
#define MAYBE_MultipleThreads DISABLED_MultipleThreads
#else
#define MAYBE_MultipleThreads MultipleThreads