[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7d7f123576e24cb0714e84e4a56b8b34ce8b8985
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 23:32:55 2010 +0000

    2010-03-02  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            new-run-webkit-tests on chromium-linux tests to see if
            layout_test_helper exists, but we don't use layout_test_helper on
            linux. The test derefences a None object, and we crash. This fixes
            that.
    
            https://bugs.webkit.org/show_bug.cgi?id=35602
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
     2010-03-02  Dirk Pranke  <dpranke at chromium.org>
    
            Reviewed by Dimitri Glazkov.
    
            r55388 (bug 35553) worked around a bug in Python's subprocess.Popen()
            that was causing DRT to hang on exit in new-run-webkit-tests.
            Unfortunately, that workaround doesn't work on chromium-win
            (and the script fails completely). The good news is that the check
            isn't actually necessary, and so this change makes it conditional.
    
            https://bugs.webkit.org/show_bug.cgi?id=35601
    
            * Scripts/webkitpy/layout_tests/port/chromium.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55435 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index ec23f0a..4327f37 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Dimitri Glazkov.
 
+        new-run-webkit-tests on chromium-linux tests to see if
+        layout_test_helper exists, but we don't use layout_test_helper on
+        linux. The test derefences a None object, and we crash. This fixes
+        that.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35602
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+
+ 2010-03-02  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Dimitri Glazkov.
+
         r55388 (bug 35553) worked around a bug in Python's subprocess.Popen()
         that was causing DRT to hang on exit in new-run-webkit-tests.
         Unfortunately, that workaround doesn't work on chromium-win
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index 10259a0..4648dec 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -81,8 +81,9 @@ class ChromiumPort(base.Port):
             logging.error('')
 
         helper_path = self._path_to_helper()
-        result = check_file_exists(helper_path,
-                                   'layout test helper') and result
+        if helper_path:
+            result = check_file_exists(helper_path,
+                                       'layout test helper') and result
 
         if not self._options.no_pixel_tests:
             image_diff_path = self._path_to_image_diff()

-- 
WebKit Debian packaging