Changeset 58146 in webkit

Timestamp:

Apr 22, 2010 9:29:05 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-22 James Robinson <​jamesr@chromium.org>

Reviewed by Adam Barth.

Revert 58077 and follow-ups. It's broken.
​https://bugs.webkit.org/show_bug.cgi?id=37664

• Scripts/new-run-webkit-httpd:
• Scripts/new-run-webkit-websocketserver:
• Scripts/webkitpy/layout_tests/port/chromium_win.py:
• Scripts/webkitpy/layout_tests/port/http_server.py:
• Scripts/webkitpy/layout_tests/port/websocket_server.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/new-run-webkit-httpd (modified) (1 diff)
• Scripts/new-run-webkit-websocketserver (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/chromium_win.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/http_server.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/port/websocket_server.py (modified) (4 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-22  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Revert 58077 and follow-ups.  It's broken.
+        https://bugs.webkit.org/show_bug.cgi?id=37664
+
+        * Scripts/new-run-webkit-httpd:
+        * Scripts/new-run-webkit-websocketserver:
+        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
+        * Scripts/webkitpy/layout_tests/port/http_server.py:
+        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
+
 2010-04-22  Yaar Schnitman  <yaar@chromium.org>
 

trunk/WebKitTools/Scripts/new-run-webkit-httpd

@@ -66 +66 @@
                                      port=options.port,
                                      root=options.root,
+                                     register_cygwin=options.register_cygwin,
                                      run_background=options.run_background)
         if options.server == 'start':

trunk/WebKitTools/Scripts/new-run-webkit-websocketserver

@@ -56 +56 @@
     option_parser.add_option('-c', '--certificate', dest='certificate',
                              default='', help='TLS certificate file.')
-    option_parser.add_option('--chromium', action='store_true',
-                             dest='chromium',
-                             default=False,
-                             help='use the Chromium port')
     option_parser.add_option('--register_cygwin', action="store_true",
                              dest="register_cygwin",
@@ -83 +79 @@
     if options.certificate:
         kwds['certificate'] = options.certificate
+    kwds['register_cygwin'] = options.register_cygwin
     if options.pidfile:
         kwds['pidfile'] = options.pidfile
 
-    port_obj = factory.get(options=options)
+    port_obj = factory.get()
     pywebsocket = websocket_server.PyWebSocket(port_obj, tempfile.gettempdir(), **kwds)
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py

@@ -51 +51 @@
             options.configuration = 'Release'
         chromium.ChromiumPort.__init__(self, port_name, options)
-        # Put the cygwin directory first in the path to find cygwin1.dll
-        env = os.environ
-        env['PATH'] = '%s;%s' % (
-            self.path_from_chromium_base('third_party', 'cygwin', 'bin'),
-            env['PATH'])
-        # Put the cygwin directory so that pywebsocket finds proper python
-        # executable to run cgi program.
-        env['CYGWIN_PATH'] = self.path_from_chromium_base(
-            'third_party', 'cygwin', 'bin')
-        if sys.platform == 'win32' and options and \
-                hasattr(options, 'register_cygwin') and \
-                options.register_cygwin:
-            setup_mount = self.path_from_chromium_base(
-                'third_party', 'cygwin', 'setup_mount.bat')
-            subprocess.Popen(setup_mount).wait()
 
     def baseline_search_path(self):

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py

@@ -56 +56 @@
 
     def __init__(self, port_obj, output_dir, background=False, port=None,
-                 root=None, run_background=None):
+                 root=None, register_cygwin=None, run_background=None):
         """Args:
           output_dir: the absolute path to the layout test result directory
@@ -66 +66 @@
         self._port = port
         self._root = root
+        self._register_cygwin = register_cygwin
         self._run_background = run_background
         if self._port:
@@ -199 +200 @@
                             os.path.join(tmp_module_path, lib_file))
 
+        # Put the cygwin directory first in the path to find cygwin1.dll
+        env = os.environ
+        if sys.platform in ('cygwin', 'win32'):
+            env['PATH'] = '%s;%s' % (
+                self._port_obj.path_from_chromium_base('third_party',
+                                                       'cygwin', 'bin'),
+                env['PATH'])
+
+        if sys.platform == 'win32' and self._register_cygwin:
+            setup_mount = self._port_obj.path_from_chromium_base('third_party',
+                'cygwin', 'setup_mount.bat')
+            subprocess.Popen(setup_mount).wait()
+
         _log.debug('Starting http server')
-        self._process = subprocess.Popen(start_cmd, env=os.environ)
+        self._process = subprocess.Popen(start_cmd, env=env)
 
         # Wait for server to start.

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

@@ -96 +96 @@
     def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
                  root=None, use_tls=False,
+                 register_cygwin=True,
                  pidfile=None):
         """Args:
@@ -102 +103 @@
         http_server.Lighttpd.__init__(self, port_obj, output_dir,
                                       port=_DEFAULT_WS_PORT,
-                                      root=root)
+                                      root=root,
+                                      register_cygwin=register_cygwin)
         self._output_dir = output_dir
         self._process = None
@@ -184 +186 @@
                               '-c', self._certificate])
 
+        # Put the cygwin directory first in the path to find cygwin1.dll
         env = os.environ
+        if sys.platform in ('cygwin', 'win32'):
+            env['PATH'] = '%s;%s' % (
+                self._port_obj.path_from_chromium_base('third_party',
+                                                       'cygwin', 'bin'),
+                env['PATH'])
+            env['CYGWIN_PATH'] = self._port_obj.path_from_chromium_base(
+                'third_party', 'cygwin', 'bin')
+
+        if sys.platform == 'win32' and self._register_cygwin:
+            setup_mount = self._port_obj.path_from_chromium_base(
+                'third_party', 'cygwin', 'setup_mount.bat')
+            subprocess.Popen(setup_mount).wait()
+
         env['PYTHONPATH'] = (pywebsocket_base + os.path.pathsep +
                              env.get('PYTHONPATH', ''))
@@ -231 +247 @@
         elif self._pidfile:
             with codecs.open(self._pidfile, "r", "ascii") as file:
-                pid = int(file.read().strip())
+                pid = int(f.read().strip())
 
         if not pid: