summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 02:29:08 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-24 02:29:08 +0000
commitc346919db56f3107657141343b892966eba2aefa (patch)
tree4b7b34eefce12c2952ea2219a140ea637269084f
parent57f3669a533542c2fee027d096f0673d3216f1ec (diff)
downloadchromium_src-c346919db56f3107657141343b892966eba2aefa.zip
chromium_src-c346919db56f3107657141343b892966eba2aefa.tar.gz
chromium_src-c346919db56f3107657141343b892966eba2aefa.tar.bz2
Revert "Remove test expecations which have been upstreamed." since the webkit roll was reverted.
This reverts commit 60400. TBR=johnnyg BUG=none TEST=none Review URL: http://codereview.chromium.org/3501004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60410 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index ab0f4fc..e656fdc 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -5,5 +5,9 @@
// Only add expectations here to temporarily suppress messages on the bots
// until the changes can be landed upstream.
+// johnnyg to move upstream
+BUGJOHNNYG WIN : fast/canvas/webgl/tex-image-and-sub-image-2d-with-video.html = TEXT PASS
+BUGJOHNNYG LINUX : plugins/embed-attributes-style.html = IMAGE
+
// atwilson will upstream
BUGATWILSON : svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE CRASH