2010-09-21 Dirk Pranke <dpranke@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 aada0455f5bf09079eb496cd4f88fe365afc89b1..83961595a5ce5cb18e34269ff5772a02110688f1 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2010-09-21  Dirk Pranke  <dpranke@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:
+
 2010-09-21  Dirk Pranke  <dpranke@chromium.org>
 
         Unreviewed, build fix.

diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py
index eb8ee5f5e98c75f0a6a4063e1595c8a890a77dfc..471df7011174b7cd4aa4ef1bad5ae047bfb36b42 100644 (file)
--- 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):