summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorphoglund <phoglund@chromium.org>2016-03-21 08:17:25 -0700
committerCommit bot <commit-bot@chromium.org>2016-03-21 15:19:40 +0000
commit7b1e235fea39faa3c449af2de45606843bba3682 (patch)
tree5fb0ab0a15521e79ae4f01d0e7f2c94be764fa0a
parent5292e16bd931c7a87bd5b7ce6ddce73ab202b592 (diff)
downloadchromium_src-7b1e235fea39faa3c449af2de45606843bba3682.zip
chromium_src-7b1e235fea39faa3c449af2de45606843bba3682.tar.gz
chromium_src-7b1e235fea39faa3c449af2de45606843bba3682.tar.bz2
Disabling flaky SingleProcessTracingBrowserTest.TestMemoryInfra
TBR=hiroshige@chromium.org BUG=594884 Review URL: https://codereview.chromium.org/1819883002 Cr-Commit-Position: refs/heads/master@{#382289}
-rw-r--r--chrome/test/base/tracing_browsertest.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/test/base/tracing_browsertest.cc b/chrome/test/base/tracing_browsertest.cc
index 496d458..ab7aca8 100644
--- a/chrome/test/base/tracing_browsertest.cc
+++ b/chrome/test/base/tracing_browsertest.cc
@@ -164,7 +164,8 @@ IN_PROC_BROWSER_TEST_F(TracingBrowserTest, BeginTracingWithWatch) {
}
// Multi-process mode.
-IN_PROC_BROWSER_TEST_F(TracingBrowserTest, TestMemoryInfra) {
+// Flaky on win and Linux: https://crbug.com/594884.
+IN_PROC_BROWSER_TEST_F(TracingBrowserTest, DISABLED_TestMemoryInfra) {
PerformDumpMemoryTestActions();
}