summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 14:32:35 +0000
committerrolandsteiner@chromium.org <rolandsteiner@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-19 14:32:35 +0000
commit2b6369f6588d2498eb473299e21fd9f471904e9b (patch)
tree923f6f2f99119478b38e696aa550ba67e651c4d5
parent0d55c6ae7ce5d520fbb817e3119afc9311c4a556 (diff)
downloadchromium_src-2b6369f6588d2498eb473299e21fd9f471904e9b.zip
chromium_src-2b6369f6588d2498eb473299e21fd9f471904e9b.tar.gz
chromium_src-2b6369f6588d2498eb473299e21fd9f471904e9b.tar.bz2
Revert some additions to test_expectations.txt made in http://codereview.chromium.org/651017
Reason: the CL that caused those crashes was reverted, the affected layout tests no longer crash: http/tests/security/cross-frame-access-custom.html http/tests/security/cross-frame-access-get.html http/tests/security/cross-frame-access-name-getter.html http/tests/security/xss-DENIED-htmlelelment-with-iframe-proto.html fast/js/Object-defineProperty.html BUG=none TEST=see above TBR=agl,jorlow Review URL: http://codereview.chromium.org/651032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39443 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt19
1 files changed, 5 insertions, 14 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 356fc0f..3d64c24 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -2326,6 +2326,7 @@ BUG21958 MAC : svg/hixie/error/012.xml = FAIL
// WebKit merge 48500:48585, newly implemented Object.defineProperty.
BUG22526 : fast/js/Object-create.html = FAIL
BUG22526 : fast/js/Object-defineProperties.html = FAIL
+BUG22526 : fast/js/Object-defineProperty.html = FAIL
BUG22526 : http/tests/security/xss-DENIED-defineProperty.html = FAIL
// WebKit merge 48500:48585, due to newly added support for MathML.
@@ -2757,13 +2758,16 @@ BUG30939 : svg/filters/filter-clip.svg = IMAGE+TEXT
// Newly added test in r52202
BUG30939 : svg/filters/filter-source-position.svg = IMAGE+TEXT
-
// WebKit roll 52468->52535
BUG31991 WIN LINUX : fast/text/international/bidi-layout-across-linebreak.html = TEXT
BUG31252 : http/tests/security/listener/xss-inactive-closure.html = TEXT
BUG31623 WIN: http/tests/appcache/remove-cache.html = PASS TEXT TIMEOUT
+// WebKit roll 52633 -> 52667
+// On Linux, sometimes the text dump matches. Not sure why.
+BUG_DIMICH LINUX : svg/custom/resource-invalidate-on-target-update.svg = IMAGE+TEXT IMAGE
+
// WebKit roll 52769 -> 52793
BUG31642 LINUX DEBUG: svg/W3C-SVG-1.1/animate-elem-30-t.svg = IMAGE CRASH
@@ -2988,16 +2992,3 @@ BUG_ROLANDSTEINER WIN LINUX : fast/repaint/selection-gap-overflow-scroll-2.html
// BUG24182 SLOW DEBUG : editing/selection/extend-selection.html = PASS
BUG_ROLANDSTEINER SLOW DEBUG : editing/selection/extend-selection.html = TEXT
BUG_ROLANDSTEINER WIN LINUX RELEASE : editing/selection/extend-selection.html = TEXT
-
-// Crashes after WebKit roll to 54996. Used to be:
-// WebKit roll 52633 -> 52667
-// On Linux, sometimes the text dump matches. Not sure why.
-// BUG_DIMICH LINUX : svg/custom/resource-invalidate-on-target-update.svg = IMAGE+TEXT IMAGE
-BUG36236 WIN LINUX : svg/custom/resource-invalidate-on-target-update.svg = CRASH
-BUG36236 : http/tests/security/cross-frame-access-custom.html = CRASH
-BUG36236 : http/tests/security/cross-frame-access-get.html = CRASH
-BUG36236 : http/tests/security/cross-frame-access-name-getter.html = CRASH
-BUG36236 : http/tests/security/xss-DENIED-htmlelelment-with-iframe-proto.html = CRASH
-// BUG22526 : fast/js/Object-defineProperty.html = FAIL
-BUG36236 : fast/js/Object-defineProperty.html = CRASH
-