diff options
| -rw-r--r-- | chrome/browser/debugger/devtools_sanity_unittest.cc | 6 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc index b79a5ae..526f7ca 100644 --- a/chrome/browser/debugger/devtools_sanity_unittest.cc +++ b/chrome/browser/debugger/devtools_sanity_unittest.cc @@ -167,12 +167,14 @@ IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestPauseInEval) { } // Tests console eval. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleEval) { +// DISABLED: See http://crbug.com/18786 +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleEval) { RunTest("testConsoleEval", kConsoleTestPage); } // Tests console log. -IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, TestConsoleLog) { +// DISABLED: See http://crbug.com/18786 +IN_PROC_BROWSER_TEST_F(DevToolsSanityTest, DISABLED_TestConsoleLog) { RunTest("testConsoleLog", kConsoleTestPage); } diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 3d99cf0..e404d70 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -2854,3 +2854,5 @@ BUG18740 WIN : LayoutTests/http/tests/security/credentials-in-referer.html = PAS BUG18665 MAC : LayoutTests/security/block-test.html = FAIL BUG18665 MAC : LayoutTests/security/block-test-no-port.html = FAIL +// Test failures from WebKit merge 46508 to 46531 +BUG18784 LINUX : LayoutTests/fast/overflow/overflow-focus-ring.html = CRASH PASS |