2010-03-17 Victor Wang <victorw@chromium.org>
authorvictorw@chromium.org <victorw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Mar 2010 18:44:32 +0000 (18:44 +0000)
committervictorw@chromium.org <victorw@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 17 Mar 2010 18:44:32 +0000 (18:44 +0000)
        Reviewed by Dimitri Glazkov.

        Fix image_diff syntax in webkitpy/port/base.py.
        The syntax is wrong if diff_filename is specified.

        https://bugs.webkit.org/show_bug.cgi?id=36230

        * Scripts/webkitpy/layout_tests/port/base.py:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@56123 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/webkitpy/layout_tests/port/base.py

index 66b736c..212073b 100644 (file)
@@ -1,3 +1,14 @@
+2010-03-17  Victor Wang  <victorw@chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
+        Fix image_diff syntax in webkitpy/port/base.py.
+        The syntax is wrong if diff_filename is specified.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36230
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2010-03-16  Diego Gonzalez  <diego.gonzalez@openbossa.org>
 
         Reviewed by Kenneth Christiansen.
index 8178d8d..6837ff4 100644 (file)
@@ -100,9 +100,13 @@ class Port(object):
         While this is a generic routine, we include it in the Port
         interface so that it can be overriden for testing purposes."""
         executable = self._path_to_image_diff()
-        cmd = [executable, '--diff', expected_filename, actual_filename]
+
         if diff_filename:
-            cmd.append(diff_filename)
+            cmd = [executable, '--diff', expected_filename, actual_filename,
+                   diff_filename]
+        else:
+            cmd = [executable, expected_filename, actual_filename]
+
         result = 1
         try:
             result = subprocess.call(cmd)