[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 2ee88645f942337749d682f6d031bc5fc32f29d1
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 23:29:22 2010 +0000

    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@55434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 7a16921..ec23f0a 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+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:
+
 2010-03-02  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
index f57fa74..10259a0 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
@@ -231,10 +231,13 @@ class ChromiumDriver(base.Driver):
         # We need to pass close_fds=True to work around Python bug #2320
         # (otherwise we can hang when we kill test_shell when we are running
         # multiple threads). See http://bugs.python.org/issue2320 .
+        # Note that close_fds isn't supported on Windows, but this bug only
+        # shows up on Mac and Linux.
+        close_flag = sys.platform not in ('win32', 'cygwin')
         self._proc = subprocess.Popen(cmd, stdin=subprocess.PIPE,
                                       stdout=subprocess.PIPE,
                                       stderr=subprocess.STDOUT,
-                                      close_fds=True)
+                                      close_fds=close_flag)
     def poll(self):
         return self._proc.poll()
 

-- 
WebKit Debian packaging