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

[dpranke at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit c3fcdd6cc160f156d7c8211532df30af389a064a
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 00:06:58 2010 +0000

    2010-09-21  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            Fix breakage of Chromium Mac DRT port caused by r67905.
    
            https://bugs.webkit.org/show_bug.cgi?id=46230
    
            * Scripts/webkitpy/layout_tests/port/webkit.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index aada045..8396159 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,16 @@
 
         Unreviewed, build fix.
 
+        Fix breakage of Chromium Mac DRT port caused by r67905.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46230
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
+2010-09-21  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix.
+
         Add missing import of 'tempfile'.
 
         * Scripts/webkitpy/layout_tests/port/chromium.py:
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
index eb8ee5f..471df70 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -410,12 +410,17 @@ class WebKitDriver(base.Driver):
 
     def _driver_args(self):
         driver_args = []
-        if self._image_path:
-            driver_args.append('--pixel-tests')
 
-        # These are used by the Chromium DRT port
         if self._options.use_drt:
+            # These are used by the Chromium DRT port
             driver_args.append('--test-shell')
+            if self._image_path:
+                driver_args.append('--pixel-tests' % image_path)
+        else:
+            # Regular DRT ports.
+            if self._image_path:
+                driver_args.append('--pixel-tests')
+
         return driver_args
 
     def start(self):

-- 
WebKit Debian packaging