[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit cdd310643d162f77aed7987fc84bc03ae46c55af
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 11 19:56:01 2010 +0000

    2010-03-10  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            rebaseline_chromium_webkit_tests doesn't handle other plaforms
            correctly (e.g., if you run on the Mac platform and try to
            rebaseline the WIN results, the result gets written into
            platform/mac instead of platform/chromium-win). Also, this script
            doesn't work on non-Chromium ports, so we need to fix that at some
            point.
    
            https://bugs.webkit.org/show_bug.cgi?id=35982
    
            * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55850 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5d74fd9..a6e7d93 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,18 @@
+2010-03-10  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        rebaseline_chromium_webkit_tests doesn't handle other plaforms
+        correctly (e.g., if you run on the Mac platform and try to
+        rebaseline the WIN results, the result gets written into
+        platform/mac instead of platform/chromium-win). Also, this script
+        doesn't work on non-Chromium ports, so we need to fix that at some
+        point.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35982
+
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
 2010-03-10  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 0c73182..8178d8d 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -465,6 +465,12 @@ class Port(object):
         might return 'mac' as a test_platform name'."""
         raise NotImplementedError('Port.platforms')
 
+    def test_platform_name_to_name(self, test_platform_name):
+        """Returns the Port platform name that corresponds to the name as
+        referenced in the expectations file. E.g., "mac" returns
+        "chromium-mac" on the Chromium ports."""
+        raise NotImplementedError('Port.test_platform_name_to_name')
+
     def version(self):
         """Returns a string indicating the version of a given platform, e.g.
         '-leopard' or '-xp'.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 37e5699..13caf4a 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -169,6 +169,12 @@ class ChromiumPort(base.Port):
         return self.test_base_platform_names() + ('win-xp',
             'win-vista', 'win-7')
 
+    def test_platform_name_to_name(self, test_platform_name):
+        if test_platform_name in self.test_platform_names():
+            return 'chromium-' + test_platform_name
+        raise ValueError('Unsupported test_platform_name: %s' %
+                         test_platform_name)
+
     #
     # PROTECTED METHODS
     #
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
index 8beee3b..d9667dd 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
@@ -404,7 +404,7 @@ class Rebaseliner(object):
         for name in zip_namelist:
             _log.debug('  ' + name)
 
-        platform = self._port.name()
+        platform = self._port.test_platform_name_to_name(self._platform)
         _log.debug('Platform dir: "%s"', platform)
 
         test_no = 1
@@ -986,6 +986,11 @@ def main():
                                    ' rebaselining comparison.'))
 
     options = option_parser.parse_args()[0]
+
+    # FIXME: Setting options.chromium to True forces port.get() to only look
+    # at Chromium ports; we hard-code this because this script doesn't work
+    # on non-Chromium ports yet. We should fix that.
+    options.chromium = True
     port_obj = port.get(None, options)
 
     # Set up our logging format.

-- 
WebKit Debian packaging