summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 23:14:07 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-11 23:14:07 +0000
commitcb641bb80001e38f4af6821db76fb1f573479ab5 (patch)
tree2ad0d44f8d143ca120ffd1fa58d570feecb2f0ed
parent30d1752d75a9e1390bb19e68c40284c7677c6c70 (diff)
downloadchromium_src-cb641bb80001e38f4af6821db76fb1f573479ab5.zip
chromium_src-cb641bb80001e38f4af6821db76fb1f573479ab5.tar.gz
chromium_src-cb641bb80001e38f4af6821db76fb1f573479ab5.tar.bz2
TTF: Re-enable DevToolsSanityTest.TestResouceContentLength and mark it as
failing on Linux. TBR=thestig BUG=44202 TEST=DevToolsSanityTest.TestResouceContentLength Review URL: http://codereview.chromium.org/2753012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@49611 0039d316-1c4b-4281-b951-d872f2087c98
-rwxr-xr-xchrome/browser/debugger/devtools_sanity_unittest.cc10
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index dba9f72..df5a5d8 100755
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -287,9 +287,15 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestEnableResourcesTab) {
RunTest("testEnableResourcesTab", kSimplePage);
}
-// http://crbug.com/44202
+// Fails after WebKit roll 59365:59477, http://crbug.com/44202.
+#if defined(OS_LINUX)
+#define MAYBE_TestResourceContentLength FAILS_TestResourceContentLength
+#else
+#define MAYBE_TestResourceContentLength TestResourceContentLength
+#endif // defined(OS_LINUX)
+
// Tests resources have correct sizes.
-IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestResourceContentLength) {
+IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, MAYBE_TestResourceContentLength) {
RunTest("testResourceContentLength", kResourceContentLengthTestPage);
}