summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 14:22:47 +0000
committerfinnur@chromium.org <finnur@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-10 14:22:47 +0000
commit40233bdd421c163e91db02da88c7b742dbd2afe3 (patch)
tree8782d275afe7c4564826ffe196b0817b12942e04
parent798eb8d98aebe9e4840c7c85487531c13ec8abc2 (diff)
downloadchromium_src-40233bdd421c163e91db02da88c7b742dbd2afe3.zip
chromium_src-40233bdd421c163e91db02da88c7b742dbd2afe3.tar.gz
chromium_src-40233bdd421c163e91db02da88c7b742dbd2afe3.tar.bz2
Rolling back WebKit roll to see if reliability bot picks up.
TBR=ukai BUG=None TEST=None Review URL: http://codereview.chromium.org/4635009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@65659 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt29
2 files changed, 30 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 1861413..78decce 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": "71730",
+ "webkit_revision": "71721",
"skia_revision": "621",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "40423",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 0ca4cc3..87f0eb1 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -4,3 +4,32 @@
//
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
+BUG_AJWONG WIN : fast/dom/Window/window-screen-properties.html = TEXT
+
+// Failure after 63609
+BUG60384 : fast/replaced/border-radius-clip.html = IMAGE TEXT IMAGE+TEXT
+
+BUG60393 MAC DEBUG : fast/selectors/001.html = TIMEOUT
+
+// Failures after Mesa 7.9 upgrade, already in upstream test_expectations.txt.
+// Need to investigate.
+BUG60651 : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT FAIL
+BUG60651 : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
+BUG60671 : fast/canvas/webgl/uniform-location.html = TIMEOUT FAIL CRASH
+
+// Failures after WebKit roll 71000:71013
+BUGJEREMY WIN LINUX : fast/block/basic/truncation-rtl.html = IMAGE+TEXT
+BUGJEREMY MAC : fast/block/basic/truncation-rtl.html = IMAGE
+BUGPFELDMAN WIN : inspector/console-log-syntax-error.html = TEXT
+BUGPKASTING WIN : fast/images/gif-loop-count.html = IMAGE
+
+// Was already marked as flaky on Win, seems to fail on Mac too.
+BUG31342 MAC WIN RELEASE : security/block-test-no-port.html = TEXT PASS
+
+BUGDIMICH MAC : fast/canvas/canvas-zoom.html = IMAGE
+BUGDIMICH MAC : fast/repaint/selection-rl.html = IMAGE
+
+BUG61739 MAC WIN : animations/suspend-resume-animation-events.html = FAIL CRASH
+
+// Probably caused by activation of ICC on Chromium-Mac, likely only requires resume
+BUG48982 MAC : tables/mozilla/bugs/bug82946-2.html = IMAGE