diff options
Diffstat (limited to 'chromium/content/browser/tracing/startup_tracing_browsertest.cc')
| -rw-r--r-- | chromium/content/browser/tracing/startup_tracing_browsertest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/chromium/content/browser/tracing/startup_tracing_browsertest.cc b/chromium/content/browser/tracing/startup_tracing_browsertest.cc index a4f2b52925e..cd0029c3a0b 100644 --- a/chromium/content/browser/tracing/startup_tracing_browsertest.cc +++ b/chromium/content/browser/tracing/startup_tracing_browsertest.cc @@ -61,9 +61,10 @@ class CommandlineStartupTracingTest : public ContentBrowserTest { DISALLOW_COPY_AND_ASSIGN(CommandlineStartupTracingTest); }; -// Failing on Android ASAN, Linux TSAN. crbug.com/1041392 +// Failing on Android/Win ASAN, Linux TSAN. crbug.com/1041392 #if (defined(OS_ANDROID) && defined(ADDRESS_SANITIZER)) || \ - (defined(OS_LINUX) && defined(THREAD_SANITIZER)) + (defined(OS_WIN) && defined(ADDRESS_SANITIZER)) || \ + ((defined(OS_LINUX) || defined(OS_CHROMEOS)) && defined(THREAD_SANITIZER)) #define MAYBE_TestStartupTracing DISABLED_TestStartupTracing #else #define MAYBE_TestStartupTracing TestStartupTracing |