summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 19:41:23 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-23 19:41:23 +0000
commitc3671833ce74d8e1774440f842670747f90e4f01 (patch)
tree77425df0109a58f3854f84783f0681e90fb4d413 /chrome
parentb021f0b64e217ca53874e28f175dab0765d48752 (diff)
downloadchromium_src-c3671833ce74d8e1774440f842670747f90e4f01.zip
chromium_src-c3671833ce74d8e1774440f842670747f90e4f01.tar.gz
chromium_src-c3671833ce74d8e1774440f842670747f90e4f01.tar.bz2
More post webkit merge misery.
Disable memory tests until I can fix them. BUG=10895 TEST=I'm disabling some of them :) Review URL: http://codereview.chromium.org/93079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-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 b1c213a..b68dbce 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -420,14 +420,14 @@ class MemoryReferenceTest : public MemoryTest {
} // namespace
-TEST_F(MemoryTest, SingleTabTest) {
+TEST_F(MemoryTest, DISABLED_SingleTabTest) {
RunTest("1t", 1);
}
-TEST_F(MemoryTest, FiveTabTest) {
+TEST_F(MemoryTest, DISABLED_FiveTabTest) {
RunTest("5t", 5);
}
-TEST_F(MemoryTest, TwelveTabTest) {
+TEST_F(MemoryTest, DISABLED_TwelveTabTest) {
RunTest("12t", 12);
}