diff options
| author | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 12:29:59 +0000 |
|---|---|---|
| committer | tyoshino@chromium.org <tyoshino@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-15 12:29:59 +0000 |
| commit | b602dc70383c2f2395b555a1a87f615fe24b8e37 (patch) | |
| tree | 3f6134f3b236d66d9dfaccee12e73abb9c647cda | |
| parent | c03028d36f6bfb798265b36192049a7e95612722 (diff) | |
| download | chromium_src-b602dc70383c2f2395b555a1a87f615fe24b8e37.zip chromium_src-b602dc70383c2f2395b555a1a87f615fe24b8e37.tar.gz chromium_src-b602dc70383c2f2395b555a1a87f615fe24b8e37.tar.bz2 | |
Mark GeneralMixMemoryTest.TwelveTabTest flaky only on win bot
R=hayato
BUG=59335
TEST=none
Review URL: http://codereview.chromium.org/3744014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62727 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/test/memory_test/memory_test.cc | 8 |
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); } |