summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 23:16:54 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-05 23:16:54 +0000
commit0a941ae101b36f1e0deb263e5b40ff29c080bf85 (patch)
treeed269cdf2ff9142fffef50954aaa011b12fa2773 /webkit
parent27d449845fad26b836e689936ccd5f5d5baa2b87 (diff)
downloadchromium_src-0a941ae101b36f1e0deb263e5b40ff29c080bf85.zip
chromium_src-0a941ae101b36f1e0deb263e5b40ff29c080bf85.tar.gz
chromium_src-0a941ae101b36f1e0deb263e5b40ff29c080bf85.tar.bz2
More updates. One crash no longer seems to occur on the Mac; a Windows test is flaky in release mode too.
TBR=jar BUG=17942,18027 TEST=none Review URL: http://codereview.chromium.org/164022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22551 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index da0f1a2..c848b50 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -1301,7 +1301,6 @@ BUG10667 MAC : chrome/plugins/return-npobject.html = FAIL
BUG10667 MAC : chrome/plugins/script-object-invoke.html = FAIL
BUG10667 MAC : pending/plugins/iframe-shims.html = FAIL CRASH
BUG18027 MAC : LayoutTests/fast/dom/object-plugin-hides-properties.html = CRASH
-BUG18027 MAC : LayoutTests/plugins/embed-attributes-style.html = CRASH
// NEW FOR MERGE 36102:37604
@@ -3033,7 +3032,7 @@ BUG17942 WIN LINUX : LayoutTests/traversal/acid3-test-2.html = CRASH PASS
BUG17942 WIN : LayoutTests/fast/replaced/image-map-2.html = CRASH PASS
BUG17942 LINUX : LayoutTests/transforms/2d/compound-2d-transforms.html = CRASH PASS
BUG17942 LINUX : LayoutTests/fast/overflow/008.html = CRASH PASS
-BUG17942 WIN DEBUG : LayoutTests/svg/dom/SVGScriptElement/script-load-and-error-events.svg = FAIL PASS
+BUG17942 WIN : LayoutTests/svg/dom/SVGScriptElement/script-load-and-error-events.svg = FAIL PASS
// New tests with this merge:
BUG17942 : LayoutTests/http/tests/misc/will-send-request-returns-null-on-redirect.html = FAIL
BUG18116 : LayoutTests/fast/dom/constructed-objects-prototypes.html = FAIL