diff options
| author | Lukasz Anforowicz <lukasza@chromium.org> | 2016-01-07 14:58:15 -0800 |
|---|---|---|
| committer | Lukasz Anforowicz <lukasza@chromium.org> | 2016-01-07 23:00:56 +0000 |
| commit | 0e8c1e4542196af2d0650c4cfebd990c43329e43 (patch) | |
| tree | d2e8acc2919d306e0cc6819bbf57e72e85551983 | |
| parent | 5ba638da61040c7fb9c05b42b0ce4a90fa22157c (diff) | |
| download | chromium_src-0e8c1e4542196af2d0650c4cfebd990c43329e43.zip chromium_src-0e8c1e4542196af2d0650c4cfebd990c43329e43.tar.gz chromium_src-0e8c1e4542196af2d0650c4cfebd990c43329e43.tar.bz2 | |
Disabling SingleProcess*Tracing*Test and MemoryInfraTest tests on Windows.
BUG=575377
TBR=simonhatch@chromium.org, primiano@chromium.org
Review URL: https://codereview.chromium.org/1568913004 .
Cr-Commit-Position: refs/heads/master@{#368184}
| -rw-r--r-- | chrome/test/base/tracing_browsertest.cc | 10 | ||||
| -rw-r--r-- | content/browser/tracing/memory_tracing_browsertest.cc | 15 |
2 files changed, 21 insertions, 4 deletions
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc index 1b95359..38e2083 100644 --- a/chrome/test/base/tracing_browsertest.cc +++ b/chrome/test/base/tracing_browsertest.cc @@ -153,13 +153,19 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) { ASSERT_TRUE(EndTracing(&json_events)); } +#if defined(OS_WIN) +#define MAYBE_TestMemoryInfra DISABLED_TestMemoryInfra +#else +#define MAYBE_TestMemoryInfra TestMemoryInfra +#endif + // Multi-process mode. -IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(TracingBrowserTest, MAYBE_TestMemoryInfra) { PerformDumpMemoryTestActions(); } // Single-process mode. -IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, TestMemoryInfra) { +IN_PROC_BROWSER_TEST_F(SingleProcessTracingBrowserTest, MAYBE_TestMemoryInfra) { PerformDumpMemoryTestActions(); } diff --git a/content/browser/tracing/memory_tracing_browsertest.cc b/content/browser/tracing/memory_tracing_browsertest.cc index 13b0923..2e2255d 100644 --- a/content/browser/tracing/memory_tracing_browsertest.cc +++ b/content/browser/tracing/memory_tracing_browsertest.cc @@ -161,10 +161,15 @@ IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, DisableTracing(); } +#if defined(OS_WIN) +#define MAYBE_RendererInitiatedSingleDump DISABLED_RendererInitiatedSingleDump +#else +#define MAYBE_RendererInitiatedSingleDump RendererInitiatedSingleDump +#endif // Checks that a memory dump initiated from a renderer thread ends up in a // single dump even in single process mode. IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, - RendererInitiatedSingleDump) { + MAYBE_RendererInitiatedSingleDump) { Navigate(shell()); EXPECT_CALL(*mock_dump_provider_, OnMemoryDump(_,_)).WillOnce(Return(true)); @@ -177,7 +182,13 @@ IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, DisableTracing(); } -IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, ManyInterleavedDumps) { +#if defined(OS_WIN) +#define MAYBE_ManyInterleavedDumps DISABLED_ManyInterleavedDumps +#else +#define MAYBE_ManyInterleavedDumps ManyInterleavedDumps +#endif +IN_PROC_BROWSER_TEST_F(SingleProcessMemoryTracingTest, + MAYBE_ManyInterleavedDumps) { Navigate(shell()); EXPECT_CALL(*mock_dump_provider_, OnMemoryDump(_,_)) |