summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authortyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 06:00:12 +0000
committertyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-18 06:00:12 +0000
commitc0f8e6dfaf2def13f3a225ac6dff33914e609e21 (patch)
treefc7244972a40d073ea85362078da0d99d402c57c /chrome/test/memory_test
parent19ee20c7d1a7703a6ba4420c289bb41cc6cf5992 (diff)
downloadchromium_src-c0f8e6dfaf2def13f3a225ac6dff33914e609e21.zip
chromium_src-c0f8e6dfaf2def13f3a225ac6dff33914e609e21.tar.gz
chromium_src-c0f8e6dfaf2def13f3a225ac6dff33914e609e21.tar.bz2
Marking GeneralMixMemoryTest.FiveTabTest flaky on Win bot
R=yutak BUG=59335 TEST=none Review URL: http://codereview.chromium.org/3781013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62909 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index ace65d9..6bb9798 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -522,7 +522,13 @@ TEST_F(GeneralMixMemoryTest, SingleTabTest) {
RunTest("_1t", 1);
}
-TEST_F(GeneralMixMemoryTest, FiveTabTest) {
+// http://crbug.com/59335 Flaky on XP bot
+#if defined(OS_WIN)
+#define MAYBE_FiveTabTest FLAKY_FiveTabTest
+#else
+#define MAYBE_FiveTabTest FiveTabTest
+#endif
+TEST_F(GeneralMixMemoryTest, MAYBE_FiveTabTest) {
RunTest("_5t", 5);
}