[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 5da79354971514b22d31a1b65106d4d125bb4653
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Feb 11 23:38:05 2010 +0000

    2010-02-11  Eric Seidel  <eric at 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:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54683 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 113af7f..882e6f8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,23 @@
+2010-02-11  Eric Seidel  <eric at 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 at rim.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
index c09ec37..4b73cec 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py
@@ -30,6 +30,7 @@
 """WebKit Mac implementation of the Port interface."""
 
 import fcntl
+import logging
 import os
 import pdb
 import platform
@@ -272,8 +273,12 @@ class MacDriver(base.Driver):
             cmd += self._options.wrapper.split()
         # 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:
         #    cmd += driver_options

-- 
WebKit Debian packaging