summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt7
2 files changed, 4 insertions, 5 deletions
diff --git a/DEPS b/DEPS
index d19f0e0..fe51998 100644
--- a/DEPS
+++ b/DEPS
@@ -16,7 +16,7 @@ deps = {
"/trunk/deps/support@20411",
"src/googleurl":
- "http://google-url.googlecode.com/svn/trunk@121",
+ "http://google-url.googlecode.com/svn/trunk@122",
"src/sdch/open-vcdiff":
"http://open-vcdiff.googlecode.com/svn/trunk@28",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index dd0049e..68bdaf2 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2910,10 +2910,9 @@ BUG33497 : storage/domstorage/sessionstorage/window-open.html = TEXT
BUG33538 : fast/dom/Window/anonymous-slot-with-changes.html = TEXT
// WebKit roll 54278 -> 54322
-BUG34546 : fast/loader/document-with-fragment-url-1.html = TIMEOUT
-BUG34546 : fast/loader/document-with-fragment-url-2.html = TIMEOUT
-BUG34546 : fast/loader/document-with-fragment-url-3.html = TIMEOUT
-BUG34546 : fast/loader/document-with-fragment-url-4.html = TIMEOUT
+// asserts in DEBUG, no need to muddy the waters and run at all for
+// the moment.
+BUG34546 SKIP : fast/loader/document-with-fragment-url-3.html = CRASH
// Flaky test
BUG35064 WIN DEBUG : fast/forms/restore-selection-after-layout.html = TEXT PASS