[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 1bf56eb0663372f4bb05c66b19e588a953e51e20
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 22 00:33:05 2010 +0000

    2010-09-21  Dirk Pranke  <dpranke at chromium.org>
    
            Unreviewed, build fix.
    
            Don't pass the --test-shell arg to the Chromium Mac port of DRT;
            it just confuses it.
    
            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@67999 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 089d2ac..538cf32 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-21  Dirk Pranke  <dpranke at chromium.org>
+
+        Unreviewed, build fix.
+
+        Don't pass the --test-shell arg to the Chromium Mac port of DRT;
+        it just confuses it.
+
+        https://bugs.webkit.org/show_bug.cgi?id=46230
+
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2010-09-21  Lucas Forschler  <lforschler at apple.com>
 
         Reviewed by Stephanie Lewis.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
index 471df70..374ef44 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
@@ -411,15 +411,8 @@ class WebKitDriver(base.Driver):
     def _driver_args(self):
         driver_args = []
 
-        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')
+        if self._image_path:
+            driver_args.append('--pixel-tests')
 
         return driver_args
 

-- 
WebKit Debian packaging