summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authoryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 01:48:12 +0000
committeryutak@chromium.org <yutak@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-30 01:48:12 +0000
commit090ad0e3a76df78c71ed0b1bceb39ac04a136090 (patch)
tree434494650c9bfccd08afe8e9a760e0ad65897afc /webkit
parentf95319d0a6408621ab8451a760bc7fd5b1aa9f75 (diff)
downloadchromium_src-090ad0e3a76df78c71ed0b1bceb39ac04a136090.zip
chromium_src-090ad0e3a76df78c71ed0b1bceb39ac04a136090.tar.gz
chromium_src-090ad0e3a76df78c71ed0b1bceb39ac04a136090.tar.bz2
Add mime-type for SVG to lighttpd.conf for run_webkit_tests.
Formerly, the HTTP server sent an SVG file as application/octet-stream, which caused the following layout test failures. This change fixes them. - LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg (issue 10387) - LayoutTests/http/tests/security/canvas-remote-read-svg-image.html (issue 18978) - LayoutTests/http/tests/misc/SVGFont-delayed-load.html (issue 20505) BUG=10387,18978,20505 TEST=none Review URL: http://codereview.chromium.org/235053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27583 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/layout_package/lighttpd.conf1
-rwxr-xr-xwebkit/tools/layout_tests/test_expectations.txt6
2 files changed, 1 insertions, 6 deletions
diff --git a/webkit/tools/layout_tests/layout_package/lighttpd.conf b/webkit/tools/layout_tests/layout_package/lighttpd.conf
index b6c5051..78fc07e 100644
--- a/webkit/tools/layout_tests/layout_package/lighttpd.conf
+++ b/webkit/tools/layout_tests/layout_package/lighttpd.conf
@@ -16,6 +16,7 @@ mimetype.assign = (
".jpg" => "image/jpeg",
".jpeg" => "image/jpeg",
".png" => "image/png",
+ ".svg" => "image/svg+xml",
".css" => "text/css",
".html" => "text/html",
".htm" => "text/html",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index 697bcbe..046aedd 100755
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -452,10 +452,6 @@ BUG18978 : LayoutTests/http/tests/xmlhttprequest/access-control-basic-allow-pref
BUG18978 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL
BUG18978 MAC RELEASE: LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL TIMEOUT
BUG18978 MAC DEBUG: LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL
-// This passes when run in Chrome. It appears to be because of a difference
-// in how lighttpd serves up the svn resource image (or the image
-// contained in the svg image).
-BUG18978 : LayoutTests/http/tests/security/canvas-remote-read-svg-image.html = FAIL
// Another lighttpd quirk.
BUG8941 LINUX WIN : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL
BUG8941 MAC : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL TIMEOUT
@@ -818,10 +814,8 @@ BUG8696 WIN LINUX : LayoutTests/fast/gradients/simple-gradients.html = FAIL
BUG8696 WIN LINUX : LayoutTests/fast/gradients/crash-on-zero-radius.html = FAIL
BUG10385 : LayoutTests/fast/dom/dom-constructors.html = FAIL
-BUG10387 SKIP : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg = FAIL
BUG10412 WIN LINUX : LayoutTests/fast/table/vertical-align-baseline.html = FAIL
-BUG20505 : LayoutTests/http/tests/misc/SVGFont-delayed-load.html = FAIL
BUG20507 : LayoutTests/http/tests/uri/resolve-encoding-relative.html = FAIL
BUG10401 : LayoutTests/plugins/npruntime.html = TIMEOUT FAIL