Changeset 105461 in webkit

Timestamp:

Jan 19, 2012 4:13:05 PM (12 years ago)

Author:

ap@apple.com

Message:

[WK2] fast/url/degenerate-file-base.html fails
​https://bugs.webkit.org/show_bug.cgi?id=76619

Reviewed by Adam Roben.

Tools:

A URL generated form local path for loading had an extra slash, making document.URL
incorrect in all WebKit2 tests (​file://localhost//path/to/test.html).

• WebKitTestRunner/TestInvocation.cpp: (WTR::createWKURL):

LayoutTests:

• platform/qt-wk2/Skipped: Unskipped the test.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-19  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] fast/url/degenerate-file-base.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76619
+
+        Reviewed by Adam Roben.
+
+        * platform/qt-wk2/Skipped: Unskipped the test.
+
 2012-01-19  Adam Barth  <abarth@webkit.org>
 

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -449 +449 @@
 svg/W3C-SVG-1.1
 svg/W3C-SVG-1.1-SE
-
-# [Qt][WK2] fast/url/degenerate-file-base.html fails
-# https://bugs.webkit.org/show_bug.cgi?id=76619
-fast/url/degenerate-file-base.html

trunk/Tools/ChangeLog

@@ +1 @@
+2012-01-19  Alexey Proskuryakov  <ap@apple.com>
+
+        [WK2] fast/url/degenerate-file-base.html fails
+        https://bugs.webkit.org/show_bug.cgi?id=76619
+
+        Reviewed by Adam Roben.
+
+        A URL generated form local path for loading had an extra slash, making document.URL
+        incorrect in all WebKit2 tests (file://localhost//path/to/test.html).
+
+        * WebKitTestRunner/TestInvocation.cpp: (WTR::createWKURL):
+
 2012-01-18  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -60 +60 @@
         return 0;
 
-    // FIXME: Remove the "localhost/" suffix once <http://webkit.org/b/55683> is fixed.
-    const char* filePrefix = "file://localhost/";
-    static const size_t prefixLength = strlen(filePrefix);
 #if OS(WINDOWS)
     const char separator = '\\';
     bool isAbsolutePath = length >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator;
+    // FIXME: Remove the "localhost/" suffix once <http://webkit.org/b/55683> is fixed.
+    const char* filePrefix = "file://localhost/";
 #else
     const char separator = '/';
     bool isAbsolutePath = pathOrURL[0] == separator;
+    const char* filePrefix = "file://";
 #endif
+    static const size_t prefixLength = strlen(filePrefix);
 
     OwnArrayPtr<char> buffer;