Changeset 45615 in webkit

Timestamp:

Jul 7, 2009 6:41:46 PM (15 years ago)

Author:

beidson@apple.com

Message:

WebKitTools:

2009-07-07 Brady Eidson <​beidson@apple.com>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=27049 - In dumpBackForwardList() mode, DRT should normalize file urls.

Make the dump of a history item agnostic to the layout of filesystem on the testing machine.

• DumpRenderTree/mac/DumpRenderTree.mm: (dumpHistoryItem):
• DumpRenderTree/win/DumpRenderTree.cpp: (dumpHistoryItem):

LayoutTests:

2009-07-07 Brady Eidson <​beidson@apple.com>

Reviewed by Mark Rowe.

​https://bugs.webkit.org/show_bug.cgi?id=27049 - In dumpBackForwardList() mode, DRT should normalize file urls.

• fast/loader/subframe-navigate-during-main-frame-load-expected.txt: Make the results agnostic to the layout of filesystem on the testing machine.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt (modified) (1 diff)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm (modified) (1 diff)
• WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-07-07  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27049 - In dumpBackForwardList() mode, DRT should normalize file urls.
+
+        * fast/loader/subframe-navigate-during-main-frame-load-expected.txt: Make the results agnostic to the layout of 
+          filesystem on the testing machine.
+
 2009-07-07  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load-expected.txt

@@ -5 +5 @@
 
 ============== Back Forward List ==============
-        file:///Volumes/Data/svn/OpenSource/LayoutTests/fast/loader/subframe-navigate-during-main-frame-load.html  **nav target**
-curr->  file:///Volumes/Data/svn/OpenSource/LayoutTests/fast/loader/resources/subframe-navigate-during-main-frame-load2.html  **nav target**
+        (file test):fast/loader/subframe-navigate-during-main-frame-load.html  **nav target**
+curr->  (file test):fast/loader/resources/subframe-navigate-during-main-frame-load2.html  **nav target**
             data:text/html,%3Cbody%20onload=%22layoutTestController.notifyDone();%22%3E%3C/body%3E (in frame "subframe")
 ===============================================

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-07-07  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Mark Rowe.
+
+        https://bugs.webkit.org/show_bug.cgi?id=27049 - In dumpBackForwardList() mode, DRT should normalize file urls.
+
+        Make the dump of a history item agnostic to the layout of filesystem on the testing machine.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (dumpHistoryItem):
+        * DumpRenderTree/win/DumpRenderTree.cpp:
+        (dumpHistoryItem):
+
 2009-07-07  Simon Hausmann  <hausmann@webkit.org>
 

trunk/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm

@@ -616 +616 @@
     for (int i = start; i < indent; i++)
         putchar(' ');
-    printf("%s", [[item URLString] UTF8String]);
+    
+    NSString *urlString = [item URLString];
+    if ([[NSURL URLWithString:urlString] isFileURL]) {
+        NSRange range = [urlString rangeOfString:@"/LayoutTests/"];
+
+        range.length = range.length + range.location;
+        range.location = 0;
+        
+        urlString = [urlString stringByReplacingCharactersInRange:range withString:@"(file test):"];
+    }
+    
+    printf("%s", [urlString UTF8String]);
     NSString *target = [item target];
     if (target && [target length] > 0)

trunk/WebKitTools/DumpRenderTree/win/DumpRenderTree.cpp

@@ -407 +407 @@
     if (FAILED(item->URLString(&url)))
         return;
+
+    if (wcsstr(url, L"file:/") == url) {
+        static wchar_t* layoutTestsString = L"/LayoutTests/";
+        static wchar_t* fileTestString = L"(file test):";
+        
+        wchar_t* result = wcsstr(url, layoutTestsString);
+        if (result == NULL)
+            return;
+        wchar_t* start = result + wcslen(layoutTestsString);
+
+        BSTR newURL = SysAllocStringLen(NULL, SysStringLen(url));
+        wcscpy(newURL, fileTestString);
+        wcscpy(newURL + wcslen(fileTestString), start);
+
+        SysFreeString(url);
+        url = newURL;
+    }
+
     printf("%S", url ? url : L"");
     SysFreeString(url);