summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 19:49:51 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-10-07 19:49:51 +0000
commitca6c1354c68d409a874395870e601d48c3093a5b (patch)
tree3021ad4d392a3eabf69c58dbcecc56e038ae29d1 /chrome
parentde60d617d7ade9fe9f4f496f881c5a68245cd3b2 (diff)
downloadchromium_src-ca6c1354c68d409a874395870e601d48c3093a5b.zip
chromium_src-ca6c1354c68d409a874395870e601d48c3093a5b.tar.gz
chromium_src-ca6c1354c68d409a874395870e601d48c3093a5b.tar.bz2
Mark DOMStorageTest.LocalStorageLayoutTests as flaky.
BUG=24145 TEST=none Review URL: http://codereview.chromium.org/270009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28290 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/in_process_webkit/dom_storage_uitest.cc11
1 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 1828679..d372883 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "build/build_config.h"
#include "chrome/common/chrome_switches.h"
#include "chrome/test/ui/ui_layout_test.h"
@@ -58,7 +59,15 @@ TEST_F(DOMStorageTest, DOMStorageLayoutTests) {
// RunLayoutTest(kTopLevelFiles[i], false, true);
}
-TEST_F(DOMStorageTest, LocalStorageLayoutTests) {
+// http://code.google.com/p/chromium/issues/detail?id=24145
+// Remove build_config.h include when this is removed.
+#if defined(OS_WIN)
+#define MAYBE_LocalStorageLayoutTests FLAKY_LocalStorageLayoutTests
+#else
+#define MAYBE_LocalStorageLayoutTests LocalStorageLayoutTests
+#endif // defined(OS_WIN)
+
+TEST_F(DOMStorageTest, MAYBE_LocalStorageLayoutTests) {
InitializeForLayoutTest(test_dir_, FilePath().AppendASCII("localstorage"),
false);
for (size_t i=0; i<arraysize(kSubDirFiles); ++i)