Commit d325a838 authored by Mark Mentovai's avatar Mark Mentovai Committed by Commit Bot

Disable browser_tests TracingBrowserTest.Test{Background,}MemoryInfra

This was previously disabled for macOS with AddressSanitizer in
7a1f2e12, but has shown itself to be flaky on
https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20(dbg)(1)
as well, so it should be disabled everywhere.

Bug: 708487
Change-Id: Idd3382b0a0bb6396a608f3c3f896a26c6fc8f6b8
TBR: primiano@chromium.org
NoTry: true
NoPresubmit: true
Reviewed-on: https://chromium-review.googlesource.com/568376
Commit-Queue: Mark Mentovai <mark@chromium.org>
Reviewed-by: default avatarMark Mentovai <mark@chromium.org>
Cr-Commit-Position: refs/heads/master@{#486026}
parent d307a1c1
...@@ -101,13 +101,8 @@ class TracingBrowserTest : public InProcessBrowserTest { ...@@ -101,13 +101,8 @@ class TracingBrowserTest : public InProcessBrowserTest {
} }
}; };
// crbug.com/708487. // crbug.com/708487
#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra
#else
#define MAYBE_TestMemoryInfra TestMemoryInfra
#endif // defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) {
PerformDumpMemoryTestActions( PerformDumpMemoryTestActions(
base::trace_event::TraceConfig( base::trace_event::TraceConfig(
base::trace_event::TraceConfigMemoryTestUtil:: base::trace_event::TraceConfigMemoryTestUtil::
...@@ -115,13 +110,8 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) { ...@@ -115,13 +110,8 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) {
base::trace_event::MemoryDumpLevelOfDetail::DETAILED); base::trace_event::MemoryDumpLevelOfDetail::DETAILED);
} }
// crbug.com/708487. // crbug.com/708487
#if defined(OS_MACOSX) && defined(ADDRESS_SANITIZER) IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestBackgroundMemoryInfra) {
#define MAYBE_TestBackgroundMemoryInfra DISABLED_TestBackgroundMemoryInfra
#else
#define MAYBE_TestBackgroundMemoryInfra TestBackgroundMemoryInfra
#endif // defined(OS_MACOSX) && defined(ADDRESS_SANITIZER)
IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestBackgroundMemoryInfra) {
PerformDumpMemoryTestActions( PerformDumpMemoryTestActions(
base::trace_event::TraceConfig( base::trace_event::TraceConfig(
base::trace_event::TraceConfigMemoryTestUtil:: base::trace_event::TraceConfigMemoryTestUtil::
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment