summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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 6d78d5e..ace65d9 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -526,7 +526,13 @@ TEST_F(GeneralMixMemoryTest, FiveTabTest) {
RunTest("_5t", 5);
}
-TEST_F(GeneralMixMemoryTest, TwelveTabTest) {
+// http://crbug.com/59335 Flaky on XP bot
+#if defined(OS_WIN)
+#define MAYBE_TwelveTabTest FLAKY_TwelveTabTest
+#else
+#define MAYBE_TwelveTabTest TwelveTabTest
+#endif
+TEST_F(GeneralMixMemoryTest, MAYBE_TwelveTabTest) {
RunTest("_12t", 12);
}