[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[ukai at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7f2385581aa0a38edebb5b257ebda88b4073a357
Author: ukai at chromium.org <ukai at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Mar 12 02:37:04 2010 +0000

    2010-03-11  Fumitoshi Ukai  <ukai at chromium.org>
    
            Unreviewed.
    
            Fix for WebSocket layout test runner on chromium/win port.
    
            * Scripts/webkitpy/layout_tests/port/websocket_server.py: register_cygwin and set CYGWIN_PATH
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 5302cdc..cb870be 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-11  Fumitoshi Ukai  <ukai at chromium.org>
+
+        Unreviewed.
+
+        Fix for WebSocket layout test runner on chromium/win port.
+
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py: register_cygwin and set CYGWIN_PATH
+
 2010-03-11  Mark Rowe  <mrowe at apple.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
index d6d2c6f..d9d6baf 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py
@@ -89,7 +89,7 @@ class PyWebSocket(http_server.Lighttpd):
 
     def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
                  root=None, use_tls=False,
-                 register_cygwin=None,
+                 register_cygwin=True,
                  pidfile=None):
         """Args:
           output_dir: the absolute path to the layout test result directory
@@ -186,6 +186,8 @@ class PyWebSocket(http_server.Lighttpd):
                 self._port_obj.path_from_chromium_base('third_party',
                                                        'cygwin', 'bin'),
                 env['PATH'])
+            env['CYGWIN_PATH'] = path_utils.path_from_base('third_party',
+                                                           'cygwin', 'bin')
 
         if sys.platform == 'win32' and self._register_cygwin:
             setup_mount = self._port_obj.path_from_chromium_base(

-- 
WebKit Debian packaging