[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 92a429972434f7c974b35d6740c1478ff4c5d512
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 29 00:32:20 2011 +0000

    2011-01-28  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            Work around breakage on Win 7 Release bot caused by r76982
            and the fact that windows ports use "file:////" instead of
            "file:///". Ideally the test code should be isolated from
            this, but it isn't yet. Will fix properly in a bit.
    
            * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77023 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index c057e77..ee91c88 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,16 @@
 2011-01-28  Dirk Pranke  <dpranke at chromium.org>
 
+        Unreviewed, build fix.
+
+        Work around breakage on Win 7 Release bot caused by r76982
+        and the fact that windows ports use "file:////" instead of
+        "file:///". Ideally the test code should be isolated from
+        this, but it isn't yet. Will fix properly in a bit.
+
+        * Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py:
+
+2011-01-28  Dirk Pranke  <dpranke at chromium.org>
+
         Reviewed by Tony Chang.
 
         new-run-webkit-tests: change worker model values to
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py b/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
index 3e89264..3aeafaf 100644
--- a/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/mock_drt_unittest.py
@@ -96,6 +96,10 @@ class MockDRTTest(unittest.TestCase):
 
     def input_line(self, test_name, checksum=None):
         url = self._port.filename_to_uri(self.to_path(test_name))
+        # FIXME: we shouldn't have to work around platform-specific issues
+        # here.
+        if url.startswith('file:////'):
+            url = url[len('file:////') - 1:]
         if url.startswith('file:///'):
             url = url[len('file:///') - 1:]
 

-- 
WebKit Debian packaging