Changeset 54683 in webkit

Timestamp:

Feb 11, 2010 3:38:05 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-02-11 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

run-chromium-webkit-tests fails random pixel tests on Mac
​https://bugs.webkit.org/show_bug.cgi?id=34862

This is due to the fact that the Mac port has an
invalid path to the image diff tool. Currently it points
to image_diff even though ImageDiff would be correct. We
can't change it to the right path yet without causing the
script to hang. ImageDiff expects to be long-running and
be passed image data over stdin. image_diff (chromium's fork)
expects to be passed command line arguments.
This fix works around the random failures by disabling pixel
tests on mac and logging if the user was trying to run with pixel
tests enabled.

• Scripts/webkitpy/layout_tests/port/mac.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-02-11  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        run-chromium-webkit-tests fails random pixel tests on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=34862
+
+        This is due to the fact that the Mac port has an
+        invalid path to the image diff tool.  Currently it points
+        to image_diff even though ImageDiff would be correct.  We
+        can't change it to the right path yet without causing the
+        script to hang.  ImageDiff expects to be long-running and
+        be passed image data over stdin.  image_diff (chromium's fork)
+        expects to be passed command line arguments.
+        This fix works around the random failures by disabling pixel
+        tests on mac and logging if the user was trying to run with pixel
+        tests enabled.
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+
 2010-02-11  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -31 +31 @@
 
 import fcntl
+import logging
 import os
 import pdb
@@ -273 +274 @@
         # FIXME: Using arch here masks any possible file-not-found errors from a non-existant driver executable.
         cmd += ['arch', '-i386', port._path_to_driver(), '-']
+
+        # FIXME: This is a hack around our lack of ImageDiff support for now.
         if not self._port._options.no_pixel_tests:
-            cmd.append('--pixel-tests')
+            logging.warn("This port does not yet support pixel tests.")
+            self._port._options.no_pixel_tests = True
+            #cmd.append('--pixel-tests')
 
         #if driver_options: