[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[kbr at google.com]

The following commit has been merged in the debian/experimental branch:
commit 6294b44c8c4f7505bb78a251e3156317df3c4a6d
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 20:54:39 2010 +0000

    2010-10-20  Kenneth Russell  <kbr at google.com>
    
            Reviewed by James Robinson.
    
            chromium_gpu port of new-run-webkit-tests must do Linux -> Win expectations fallback
            https://bugs.webkit.org/show_bug.cgi?id=48005
    
            * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70175 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a57e1e4..0a53b02 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-10-20  Kenneth Russell  <kbr at google.com>
+
+        Reviewed by James Robinson.
+
+        chromium_gpu port of new-run-webkit-tests must do Linux -> Win expectations fallback
+        https://bugs.webkit.org/show_bug.cgi?id=48005
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu.py:
+
 2010-10-20  Adam Barth  <abarth at webkit.org>
 
         Reviewed by Eric Seidel.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
index ee84e8b..95c716e 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu.py
@@ -90,7 +90,8 @@ class ChromiumGpuLinuxPort(chromium_linux.ChromiumLinuxPort):
         chromium_linux.ChromiumLinuxPort.__init__(self, **kwargs)
 
     def baseline_search_path(self):
-        return (map(self._webkit_baseline_path, ['chromium-gpu-linux', 'chromium-gpu']) +
+        # Mimic the Linux -> Win expectations fallback in the ordinary Chromium port.
+        return (map(self._webkit_baseline_path, ['chromium-gpu-linux', 'chromium-gpu-win', 'chromium-gpu']) +
                 chromium_linux.ChromiumLinuxPort.baseline_search_path(self))
 
     def path_to_test_expectations_file(self):

-- 
WebKit Debian packaging