summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt41
2 files changed, 36 insertions, 7 deletions
diff --git a/DEPS b/DEPS
index 26e76b3..3b73f1c 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "50313",
+ "webkit_revision": "50324",
"ffmpeg_revision": "30374",
}
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0f672a5..748d530 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -73,7 +73,6 @@ BUG24182 SLOW WIN : LayoutTests/fast/dom/Window/webkitConvertPoint.html = PASS
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/loading/redirect-methods.html = PASS
BUG24182 WIN LINUX DEBUG SLOW : LayoutTests/tables/mozilla/bugs/bug5797.html = PASS
BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/svg/custom/linking-a-03-b-viewBox-transform.svg = PASS
-BUG24182 WIN RELEASE SLOW : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS
BUG24182 WIN DEBUG SLOW : LayoutTests/editing/deleting/delete-line-016.html = PASS
BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/svg/hixie/perf/001.xml = PASS
BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/svg/hixie/perf/002.xml = PASS
@@ -83,7 +82,6 @@ BUG24182 WIN LINUX DEBUG : LayoutTests/fast/backgrounds/size/contain-and-cover.h
BUG24182 MAC SLOW : LayoutTests/dom/html/level2/html/HTMLImageElement01.html = PASS
BUG24182 SLOW WIN DEBUG : LayoutTests/svg/carto.net/scrollbar.svg = PASS
BUG24182 SLOW WONTFIX DEBUG : LayoutTests/platform/mac-snowleopard/accessibility/aria-list-and-listitem.html = PASS
-BUG24182 SLOW WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = PASS
BUG24182 SLOW WIN : LayoutTests/http/tests/local/file-url-sent-as-referer.html = PASS
BUG24182 SLOW WIN : LayoutTests/svg/carto.net/window.svg = PASS
BUG24182 SLOW WIN LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug149275-2.html = PASS
@@ -113,6 +111,8 @@ BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/XMLHttpRequest
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/xmlhttprequest/connection-error-sync.html = PASS
BUG24182 WIN RELEASE SLOW : LayoutTests/http/tests/loading/onload-vs-immediate-refresh.pl = PASS
BUG24182 SLOW DEBUG : LayoutTests/editing/selection/extend-selection.html = PASS
+// was slow, timed out in roll to WebKit r50324
+BUG24182 WIN : LayoutTests/fast/backgrounds/svg-as-background-5.html = TIMEOUT
// --- collecting results for supported-xml-content-types.html ---
BUG24182 SLOW WIN RELEASE : LayoutTests/http/tests/xmlhttprequest/supported-xml-content-types.html = PASS
@@ -918,6 +918,8 @@ BUG24206 : LayoutTests/http/tests/navigation/changing-frame-hierarchy-in-onload.
// moves the mouse around, resulting in a layout that dances around.
// Depending upon when the snapshot is taken we get different results.
BUG10280 WIN LINUX : LayoutTests/fast/inline/dirtyLinesForInline.html = FAIL PASS
+// WebKit roll 50313:50324
+BUG_ROLANDSTEINER MAC : LayoutTests/fast/inline/dirtyLinesForInline.html = IMAGE+TEXT
BUG20507 : LayoutTests/http/tests/uri/resolve-encoding-relative.html = FAIL
@@ -1506,7 +1508,8 @@ BUG10369 LINUX : LayoutTests/editing/selection/5354455-2.html = FAIL
BUG10370 MAC : LayoutTests/fast/css/font-weight-1.html = FAIL
// Error from CGImageSourceUpdateData but everything else is correct.
-BUG10373 MAC : LayoutTests/http/tests/multipart/invalid-image-data.html = FAIL
+// started to pass in roll to WebKit r50324
+BUG10373 MAC : LayoutTests/http/tests/multipart/invalid-image-data.html = PASS FAIL
// Not really sure why these are failing at the moment
BUG10376 MAC : LayoutTests/fast/dom/isindex-002.html = FAIL
@@ -2505,7 +2508,6 @@ BUG9798 LINUX RELEASE : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 MAC DEBUG : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 WIN : chrome/fast/dom/extensions/interval.html = FAIL PASS
BUG9798 LINUX RELEASE : LayoutTests/editing/execCommand/15381.html = FAIL PASS
-BUG9798 WIN DEBUG : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS TIMEOUT
BUG9798 LINUX DEBUG : LayoutTests/svg/carto.net/scrollbar.svg = PASS TIMEOUT
BUG9798 WIN LINUX : LayoutTests/editing/pasteboard/subframe-dragndrop-1.html = FAIL PASS
BUG9798 WIN : LayoutTests/fast/dom/Window/slow_unload_handler.html = TIMEOUT PASS
@@ -3274,5 +3276,32 @@ BUG26291 MAC : LayoutTests/fast/text/atsui-multiple-renderers.html = IMAGE
BUG26291 MAC : LayoutTests/fast/text/drawBidiText.html = IMAGE
BUG26291 MAC : LayoutTests/transforms/2d/hindi-rotated.html = IMAGE
// --- Windows ---
-// Regressions: Unexpected crashes (1):
-BUG26291 WIN : LayoutTests/fast/forms/button-submit.html = CRASH \ No newline at end of file
+// Regressions: Unexpected crashes (1), passed again in roll to 50324
+BUG26291 WIN : LayoutTests/fast/forms/button-submit.html = PASS CRASH
+
+// WebKit roll 50313:50324
+BUG_ROLANDSTEINER MAC LINUX : LayoutTests/fast/block/float/float-in-float-hit-testing.html = IMAGE
+BUG_ROLANDSTEINER LINUX : LayoutTests/fast/events/click-focus-anchor.html = TEXT
+BUG_ROLANDSTEINER MAC : LayoutTests/fast/events/click-focus-anchor.html = TEXT
+BUG_ROLANDSTEINER MAC : LayoutTests/http/tests/plugins/interrupted-get-url.html = TEXT
+BUG_ROLANDSTEINER WIN : LayoutTests/fast/events/click-focus-anchor.html = TEXT
+BUG_ROLANDSTEINER WIN : LayoutTests/fast/block/float/float-in-float-hit-testing.html = IMAGE
+BUG_ROLANDSTEINER WIN : LayoutTests/editing/inserting/typing-003.html = TIMEOUT
+BUG_ROLANDSTEINER WIN : LayoutTests/fast/block/margin-collapse/102.html = TIMEOUT
+BUG_ROLANDSTEINER WIN : LayoutTests/http/tests/incremental/slow-utf8-text.pl = TIMEOUT
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement02.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement03.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement04.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement05.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement06.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement07.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement08.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement09.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement10.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLBodyElement08.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLBodyElement12.html = CRASH
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLDocument02.html = CRASH
+// used to be slow/timout, crashed in roll to WebKit r50324
+// was: BUG9798 WIN DEBUG : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS TIMEOUT
+// was: BUG24182 WIN RELEASE SLOW : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = PASS
+BUG_ROLANDSTEINER WIN : LayoutTests/dom/html/level2/html/HTMLAppletElement01.html = CRASH