[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 cf703340b9d2ab47353d7ccd2f8fd3593ebdd876
Author: kbr at google.com <kbr at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 20 21:57:06 2010 +0000

    2010-10-20  Kenneth Russell  <kbr at google.com>
    
            Reviewed by Dimitri Glazkov.
    
            Regression in chromium_gpu_unittests after r70175
            https://bugs.webkit.org/show_bug.cgi?id=48008
    
            * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70182 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 0a53b02..307eb3e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
 2010-10-20  Kenneth Russell  <kbr at google.com>
 
+        Reviewed by Dimitri Glazkov.
+
+        Regression in chromium_gpu_unittests after r70175
+        https://bugs.webkit.org/show_bug.cgi?id=48008
+
+        * Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py:
+
+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
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
index 8c7fbe0..7a13b1c 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_gpu_unittest.py
@@ -55,7 +55,11 @@ class ChromiumGpuTest(unittest.TestCase):
         # test that it has the right directories in front of the search path.
         paths = port.baseline_search_path()
         self.assertEqual(port._webkit_baseline_path(port_name), paths[0])
-        self.assertEqual(port._webkit_baseline_path('chromium-gpu'), paths[1])
+        if port_name == 'chromium-gpu-linux':
+            self.assertEqual(port._webkit_baseline_path('chromium-gpu-win'), paths[1])
+            self.assertEqual(port._webkit_baseline_path('chromium-gpu'), paths[2])
+        else:
+            self.assertEqual(port._webkit_baseline_path('chromium-gpu'), paths[1])
 
         # Test that we have the right expectations file.
         self.assertTrue('chromium-gpu' in

-- 
WebKit Debian packaging