summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 04:21:46 +0000
committerkbr@google.com <kbr@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-28 04:21:46 +0000
commit4f61d9e234c410d03280a79ea501062c1459f8c7 (patch)
treeae82d306f1ba2f17251b9bafa63ed2252bb92875 /webkit
parentdecc1e26185ef0c2476918437a729754c79295a1 (diff)
downloadchromium_src-4f61d9e234c410d03280a79ea501062c1459f8c7.zip
chromium_src-4f61d9e234c410d03280a79ea501062c1459f8c7.tar.gz
chromium_src-4f61d9e234c410d03280a79ea501062c1459f8c7.tar.bz2
Second attempt. Roll WebKit 84939:85141.
Removed now-upstreamed test expectations. Added downstream suppressions for a few new failures. BUG=none TBR=dpranke Review URL: http://codereview.chromium.org/6905087 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 15cca0e..f57db73 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -5,11 +5,11 @@
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
-// Flakiness on the deps bots
-BUGDPRANKE WIN CPU DEBUG : editing/selection/select-line.html = PASS CRASH
-BUGDPRANKE WIN CPU DEBUG : fast/css/last-of-type-pseudo-class.html = PASS TEXT
-BUGDPRANKE WIN CPU DEBUG : fast/filesystem/file-writer-write-overlapped.html = TEXT PASS
-BUGDPRANKE WIN CPU DEBUG : http/tests/local/stylesheet-and-script-load-order-media-print.html = PASS CRASH
-BUGDPRANKE WIN CPU DEBUG : svg/text/select-textLength-spacingAndGlyphs-squeeze-3.svg = PASS CRASH
-BUGDPRANKE MAC CPU DEBUG : fast/block/float/overhanging-tall-block.html = PASS CRASH
-BUGDPRANKE MAC CPU DEBUG : fast/css/import_with_baseurl.html = PASS CRASH
+// Crashiness noted near WebKit r85140
+BUGCR80745 DEBUG : editing/pasteboard/paste-event-only-once.html = PASS CRASH
+BUGCR80745 DEBUG : fast/css/getComputedStyle/getComputedStyle-border-box.html = PASS CRASH
+
+// Flaky tests noted near WebKit r85140
+BUGKBR MAC DEBUG : editing/execCommand/append-node-under-document.html = TEXT PASS
+BUGKBR WIN DEBUG : fast/filesystem/file-writer-truncate-extend.html = PASS TEXT
+BUGKBR WIN DEBUG : fast/events/change-overflow-on-overflow-change.html = PASS TIMEOUT