summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 02:18:06 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-14 02:18:06 +0000
commita2a129f4d9ca02e9a6a23ca81c276e584e98445e (patch)
tree30d4cc70865943e4ef0da27160d46720452ba64d
parentc50af720527d63443484f0fd7adf64b15adbd4ec (diff)
downloadchromium_src-a2a129f4d9ca02e9a6a23ca81c276e584e98445e.zip
chromium_src-a2a129f4d9ca02e9a6a23ca81c276e584e98445e.tar.gz
chromium_src-a2a129f4d9ca02e9a6a23ca81c276e584e98445e.tar.bz2
Disable memory test on 64bit Linux since it sometimes crashes right now.
TEST=none BUG=none Review URL: http://codereview.chromium.org/391065 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31988 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/test/memory_test/memory_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index 8370579..845885e 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -23,9 +23,9 @@
#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
+#define MAYBE_SingleTabTest DISABLED_SingleTabTest
+#define MAYBE_FiveTabTest DISABLED_FiveTabTest
+#define MAYBE_TwelveTabTest DISABLED_TwelveTabTest
#else
#define MAYBE_SingleTabTest SingleTabTest
#define MAYBE_FiveTabTest FiveTabTest