summaryrefslogtreecommitdiffstats
path: root/chrome/test/memory_test
diff options
context:
space:
mode:
authortc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 17:56:39 +0000
committertc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-29 17:56:39 +0000
commitec9df9e10e98bdd34ae5cd50b1b6bc1d424d4395 (patch)
tree076d0dec14f3905c9b23337de6ea925f58675a7c /chrome/test/memory_test
parentb01f528385f1702f041c1f6d98d2e711b0c8c67c (diff)
downloadchromium_src-ec9df9e10e98bdd34ae5cd50b1b6bc1d424d4395.zip
chromium_src-ec9df9e10e98bdd34ae5cd50b1b6bc1d424d4395.tar.gz
chromium_src-ec9df9e10e98bdd34ae5cd50b1b6bc1d424d4395.tar.bz2
Disable memory tests that are failing after recent webkit merges.
TBR=brettw Review URL: http://codereview.chromium.org/118009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17200 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/memory_test')
-rw-r--r--chrome/test/memory_test/memory_test.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/test/memory_test/memory_test.cc b/chrome/test/memory_test/memory_test.cc
index e06727d..e5d0ddf 100644
--- a/chrome/test/memory_test/memory_test.cc
+++ b/chrome/test/memory_test/memory_test.cc
@@ -420,11 +420,11 @@ 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);
}