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

[victorw at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 398f0fdfb40fc0c630cc042a3f308fd80115ef82
Author: victorw at chromium.org <victorw at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 00:50:10 2010 +0000

    2010-03-11  Victor Wang  <victorw at chromium.org>
    
            Reviewed by dglazkov at chromium.org.
    
            rebaseline_chromium_webkit_tests can generate new baselines for
            all platforms so it needs to know two ports in order to work correctly:
            the port that the script is running on and the port that it generates
            new baselines for. Update rebaselining tool to handle both port correctly.
    
            https://bugs.webkit.org/show_bug.cgi?id=36032
    
            * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4cb5056..ce4672c 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-03-11  Victor Wang  <victorw at chromium.org>
+
+        Reviewed by dglazkov at chromium.org.
+
+        rebaseline_chromium_webkit_tests can generate new baselines for
+        all platforms so it needs to know two ports in order to work correctly:
+        the port that the script is running on and the port that it generates
+        new baselines for. Update rebaselining tool to handle both port correctly.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36032
+
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
 2010-03-11  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Tim Hatcher.
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 d9667dd..962bf38 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
@@ -203,12 +203,16 @@ class Rebaseliner(object):
 
     REVISION_REGEX = r'<a href=\"(\d+)/\">'
 
-    def __init__(self, port, platform, options):
-        self._file_dir = port.path_from_chromium_base('webkit', 'tools',
-            'layout_tests')
-        self._port = port
+    def __init__(self, running_port, platform, options):
+        self._file_dir = running_port.path_from_chromium_base(
+            'webkit', 'tools', 'layout_tests')
         self._platform = platform
         self._options = options
+        # This is the port that the script is running on.
+        self._port = running_port
+        # This is the port that the rebaselining tool creates new baselines for.
+        self._rebaseline_port = port.get(
+            self._port.test_platform_name_to_name(platform), options)
         self._rebaselining_tests = []
         self._rebaselined_tests = []
 
@@ -216,9 +220,9 @@ class Rebaseliner(object):
         #   -. compile list of tests that need rebaselining.
         #   -. update the tests in test_expectations file after rebaseline
         #      is done.
-        expectations_str = self._port.test_expectations()
+        expectations_str = self._rebaseline_port.test_expectations()
         self._test_expectations = \
-            test_expectations.TestExpectations(self._port,
+            test_expectations.TestExpectations(self._rebaseline_port,
                                                None,
                                                expectations_str,
                                                self._platform,
@@ -404,7 +408,8 @@ class Rebaseliner(object):
         for name in zip_namelist:
             _log.debug('  ' + name)
 
-        platform = self._port.test_platform_name_to_name(self._platform)
+        platform = self._rebaseline_port.test_platform_name_to_name(
+            self._platform)
         _log.debug('Platform dir: "%s"', platform)
 
         test_no = 1
@@ -503,8 +508,8 @@ class Rebaseliner(object):
           False otherwise.
         """
         test_filepath = os.path.join(self._port.layout_tests_dir(), test)
-        all_baselines = self._port.expected_baselines(test_filepath,
-                                                      suffix, True)
+        all_baselines = self._rebaseline_port.expected_baselines(
+            test_filepath, suffix, True)
         for (fallback_dir, fallback_file) in all_baselines:
             if fallback_dir and fallback_file:
                 fallback_fullpath = os.path.normpath(

-- 
WebKit Debian packaging