Mark memory_test as flaky on 64bit linux

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/386034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31975 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 13 insertions, 3 deletions

diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index 40920ee..8370579 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -22,6 +22,16 @@
 #include "net/base/net_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+#if defined(OS_LINUX) && __x86_64__
+#define MAYBE_SingleTabTest FLAKY_SingleTabTest
+#define MAYBE_FiveTabTest FLAKY_FiveTabTest
+#define MAYBE_TwelveTabTest FLAKY_TwelveTabTest
+#else
+#define MAYBE_SingleTabTest SingleTabTest
+#define MAYBE_FiveTabTest FiveTabTest
+#define MAYBE_TwelveTabTest TwelveTabTest
+#endif
+
 namespace {
 
 static const FilePath::CharType kTempDirName[] =
@@ -633,15 +643,15 @@ std::string MembusterMemoryTest::source_urls_[] = {
 size_t MembusterMemoryTest::urls_length_ =
     arraysize(MembusterMemoryTest::source_urls_);
 
-TEST_F(GeneralMixMemoryTest, SingleTabTest) {
+TEST_F(GeneralMixMemoryTest, MAYBE_SingleTabTest) {
   RunTest("1t", 1);
 }
 
-TEST_F(GeneralMixMemoryTest, FiveTabTest) {
+TEST_F(GeneralMixMemoryTest, MAYBE_FiveTabTest) {
   RunTest("5t", 5);
 }
 
-TEST_F(GeneralMixMemoryTest, TwelveTabTest) {
+TEST_F(GeneralMixMemoryTest, MAYBE_TwelveTabTest) {
   RunTest("12t", 12);
 }