summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 01:46:03 +0000
committerjparent@chromium.org <jparent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-19 01:46:03 +0000
commit49372be2bd8f891dda8a92bd2c87dce42e33f592 (patch)
tree6c9833e30a49d5c984a45bdf16aac85e06fe6028
parent86a39b47d42b065d53cdac710e47dab0df2eca1a (diff)
downloadchromium_src-49372be2bd8f891dda8a92bd2c87dce42e33f592.zip
chromium_src-49372be2bd8f891dda8a92bd2c87dce42e33f592.tar.gz
chromium_src-49372be2bd8f891dda8a92bd2c87dce42e33f592.tar.bz2
Webkit merge fallout, marking LayoutTests/fast/history/back-forward-is-asynchronous.html as TIMEOUT on linux, LayoutTests/fast/multicol/columns-shorthand-parsing.html as CRASH linux debug, will follow up tomorrow.
BUG=none TEST=none TBR=cevans Review URL: http://codereview.chromium.org/173035 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23681 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index bb80f56..e17c319 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2795,6 +2795,8 @@ BUG19544 : LayoutTests/fast/loader/user-style-sheet-resource-load-callbacks.html
// Fallout from webkit 47305:47383
BUG19655 : LayoutTests/fast/dom/Window/HTMLBodyElement-window-eventListener-attributes.html = FAIL
BUG19655 : LayoutTests/fast/dom/Window/HTMLFrameSetElement-window-eventListener-attributes.html = FAIL
+BUG_JPARENT LINUX MAC: LayoutTests/fast/history/back-forward-is-asynchronous.html = TIMEOUT
+BUG_JPARENT LINUX DEBUG : LayoutTests/fast/multicol/columns-shorthand-parsing.html = CRASH
// WebKit added implementation of the EventSource object that enables
// server-sent events from HTML5. Not implemented in Chrome yet.
BUG19625 WIN LINUX : LayoutTests/http/tests/eventsource/workers/eventsource-simple.html = CRASH