summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 20:16:40 +0000
committerericroman@google.com <ericroman@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-22 20:16:40 +0000
commit9e97a4b455b06efff44840b9fc9e470e1e2968f3 (patch)
tree7ce9899cc2387ec8079289b5325848503431ae3e
parentefe8834cdc46f8c8a011ab598315a33c0ed5b71e (diff)
downloadchromium_src-9e97a4b455b06efff44840b9fc9e470e1e2968f3.zip
chromium_src-9e97a4b455b06efff44840b9fc9e470e1e2968f3.tar.gz
chromium_src-9e97a4b455b06efff44840b9fc9e470e1e2968f3.tar.bz2
Rebase a layout test to match GURL's canonicalization (mostly trailing slashes).
Review URL: http://codereview.chromium.org/8049 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3757 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--webkit/data/layout_test_results/v8/LayoutTests/fast/loader/url-parse-1-expected.txt38
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt1
2 files changed, 38 insertions, 1 deletions
diff --git a/webkit/data/layout_test_results/v8/LayoutTests/fast/loader/url-parse-1-expected.txt b/webkit/data/layout_test_results/v8/LayoutTests/fast/loader/url-parse-1-expected.txt
new file mode 100644
index 0000000..e0b101d
--- /dev/null
+++ b/webkit/data/layout_test_results/v8/LayoutTests/fast/loader/url-parse-1-expected.txt
@@ -0,0 +1,38 @@
+The following table shows how URLs are parsed and canonicalized. The base URI for this document is file:///BASE/.
+
+URL href host pathname
+file:///BASE/ /BASE/
+test file:///BASE/test /BASE/test
+/ file:/// /
+/test file:///test /test
+// file:/// /
+//test file://test/ test /
+/// file:/// /
+///test file:///test /test
+file: file:///BASE/ /BASE/
+file:test file:///BASE/test /BASE/test
+file:/ file:/// /
+file:/test file:///test /test
+file:// file:/// /
+file://test file://test/ test /
+file:/// file:/// /
+file:///test file:///test /test
+file://localhost file://localhost/ localhost /
+file://localhost/ file://localhost/ localhost /
+file://localhost/test file://localhost/test localhost /test
+http: http:
+http:/ http:
+http:// http:
+http:/// http:
+http://// http:
+http://localhost http://localhost/ localhost /
+http://localhost/ http://localhost/ localhost /
+http://localhost/test http://localhost/test localhost /test
+x-webkit: x-webkit:
+x-webkit:test x-webkit:test test
+x-webkit:/ x-webkit:/ /
+x-webkit:/test x-webkit:/test /test
+x-webkit:// x-webkit:
+x-webkit://test x-webkit://test/ test /
+x-webkit:/// x-webkit:
+x-webkit:///test x-webkit://test/ test /
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 7aebfd3..0a86e4e 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -937,7 +937,6 @@ V8 | KJS # LayoutTests/fast/dom/resource-locations-in-created-html-document.html
V8 | KJS # LayoutTests/fast/forms/form-hides-table.html = FAIL
V8 | KJS # LayoutTests/fast/forms/input-readonly-autoscroll.html = FAIL
V8 | KJS # LayoutTests/fast/forms/legend-access-key.html = FAIL
-V8 | KJS # LayoutTests/fast/loader/url-parse-1.html = FAIL
V8 | KJS # LayoutTests/fast/replaced/replaced-breaking.html = FAIL
V8 | KJS # LayoutTests/fast/table/text-field-baseline.html = FAIL
V8 | KJS # LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html = FAIL | PASS