summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt16
2 files changed, 9 insertions, 9 deletions
diff --git a/DEPS b/DEPS
index 4a6f3af..c81a94a 100644
--- a/DEPS
+++ b/DEPS
@@ -4,7 +4,7 @@ vars = {
"googlecode_url": "http://%s.googlecode.com/svn",
"webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
"nacl_trunk": "http://src.chromium.org/native_client/trunk",
- "webkit_revision": "85141",
+ "webkit_revision": "84939",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed.
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index f57db73..15cca0e 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.
-// 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
+// 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