summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 04:43:39 +0000
committerlevin@chromium.org <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-19 04:43:39 +0000
commit05b66161a39e6cd6422528cac220df275d3aa239 (patch)
tree5ec624948281240ff779a2e481a0522e80d0770e
parentd1e63c26f8ba9a5458ddc06af39e64d1b0d361b9 (diff)
downloadchromium_src-05b66161a39e6cd6422528cac220df275d3aa239.zip
chromium_src-05b66161a39e6cd6422528cac220df275d3aa239.tar.gz
chromium_src-05b66161a39e6cd6422528cac220df275d3aa239.tar.bz2
Disable TestEnableResourcesTab.
BUG=59727 TEST=interactive_ui_tests --gtest_filter=TestEnableResourcesTab TBR=tyoshino@chromium.org Review URL: http://codereview.chromium.org/3781019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63018 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/debugger/devtools_sanity_unittest.cc9
1 files changed, 8 insertions, 1 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index dbaa4e2..3f6393d 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -254,8 +254,15 @@ class DevToolsExtensionDebugTest : public DevToolsSanityTest,
FilePath test_extensions_dir_;
};
+// Fails after WebKit roll 69808:70011, http://crbug.com/59727.
+#if defined(OS_LINUX) || defined(OS_WIN)
+#define MAYBE_TestEnableResourcesTab DISABLED_TestEnableResourcesTab
+#else
+#define MAYBE_TestEnableResourcesTab TestEnableResourcesTab
+#endif // defined(OS_LINUX) || defined(OS_WIN)
+
// Tests resources panel enabling.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestEnableResourcesTab) {
RunTest("testEnableResourcesTab", kSimplePage);
}