2010-03-11 Fumitoshi Ukai <ukai@chromium.org>
authorukai@chromium.org <ukai@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Mar 2010 02:37:04 +0000 (02:37 +0000)
committerukai@chromium.org <ukai@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Mar 2010 02:37:04 +0000 (02:37 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@55875 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitTools/ChangeLog
WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py

index 5302cdc..cb870be 100644 (file)
@@ -1,3 +1,11 @@
+2010-03-11  Fumitoshi Ukai  <ukai@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@apple.com>
 
         Reviewed by David Kilzer.
index d6d2c6f..d9d6baf 100644 (file)
@@ -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(