Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1751)

Unified Diff: base/metrics/stats_table_unittest.cc

Issue 580213002: Disable TLS destructor tests on Win x64 incremental (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update comment Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/base.gyp ('k') | base/threading/thread_local_storage_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/metrics/stats_table_unittest.cc
diff --git a/base/metrics/stats_table_unittest.cc b/base/metrics/stats_table_unittest.cc
index 53a47315e6fbb4f484e267ed5bf3eb429788db5f..840f9261601f6760c153e12203e9ab06ef3193f6 100644
--- a/base/metrics/stats_table_unittest.cc
+++ b/base/metrics/stats_table_unittest.cc
@@ -101,7 +101,11 @@ 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) || defined(THREAD_SANITIZER)
+// It is disabled on Win x64 incremental linking pending resolution of
+// http://crbug.com/251251.
+#if defined(OS_MACOSX) || defined(THREAD_SANITIZER) || \
+ (defined(OS_WIN) && defined(ARCH_CPU_X86_64) && \
+ defined(INCREMENTAL_LINKING))
#define MAYBE_MultipleThreads DISABLED_MultipleThreads
#else
#define MAYBE_MultipleThreads MultipleThreads
« no previous file with comments | « base/base.gyp ('k') | base/threading/thread_local_storage_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698