Changeset 59595 in webkit


Ignore:
Timestamp:
May 17, 2010 12:06:50 AM (14 years ago)
Author:
ukai@chromium.org
Message:

2010-05-17 Fumitoshi Ukai <ukai@chromium.org>

Reviewed by Eric Seidel.

Chromium: Add --chromium option to new-run-webkit-websocketserver
https://bugs.webkit.org/show_bug.cgi?id=37664

os.environ setup and setup_mount for cygwin are moved in ChromiumWinPort.setup_environ_for_server.

  • Scripts/new-run-webkit-httpd: Remove passing register_cygwin.
  • Scripts/new-run-webkit-websocketserver: Add --chromium flag. Remove passing register_cygwin. Create port object using options.
  • Scripts/webkitpy/layout_tests/port/base.py: Add setup_environ_for_server().
  • Scripts/webkitpy/layout_tests/port/chromium_win.py: Ditto.
  • Scripts/webkitpy/layout_tests/port/factory_unittest.py: Added.
  • Scripts/webkitpy/layout_tests/port/http_server.py: Remove register_cygwin_parameter. Call setup_environ_for_server().
  • Scripts/webkitpy/layout_tests/port/websocket_server.py: Ditto.
Location:
trunk/WebKitTools
Files:
1 added
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r59593 r59595  
     12010-05-17  Fumitoshi Ukai  <ukai@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Chromium: Add --chromium option to new-run-webkit-websocketserver
     6        https://bugs.webkit.org/show_bug.cgi?id=37664
     7
     8        os.environ setup and setup_mount for cygwin are moved in ChromiumWinPort.setup_environ_for_server.
     9
     10        * Scripts/new-run-webkit-httpd:
     11          Remove passing register_cygwin.
     12        * Scripts/new-run-webkit-websocketserver:
     13          Add --chromium flag.
     14          Remove passing register_cygwin.
     15          Create port object using options.
     16        * Scripts/webkitpy/layout_tests/port/base.py:
     17          Add setup_environ_for_server().
     18        * Scripts/webkitpy/layout_tests/port/chromium_win.py:
     19          Ditto.
     20        * Scripts/webkitpy/layout_tests/port/factory_unittest.py: Added.
     21        * Scripts/webkitpy/layout_tests/port/http_server.py:
     22          Remove register_cygwin_parameter.
     23          Call setup_environ_for_server().
     24        * Scripts/webkitpy/layout_tests/port/websocket_server.py:
     25          Ditto.
     26
    1272010-05-16  Daniel Bates  <dbates@rim.com>
    228
  • trunk/WebKitTools/Scripts/new-run-webkit-httpd

    r58146 r59595  
    6666                                     port=options.port,
    6767                                     root=options.root,
    68                                      register_cygwin=options.register_cygwin,
    6968                                     run_background=options.run_background)
    7069        if options.server == 'start':
  • trunk/WebKitTools/Scripts/new-run-webkit-websocketserver

    r59350 r59595  
    4343    option_parser.add_option('--server', type='choice',
    4444                             choices=['start', 'stop'], default='start',
    45                              help='Server action (start|stop)')
     45                             help='Server action (start|stop).')
    4646    option_parser.add_option('-p', '--port', dest='port',
    47                              default=None, help='Port to listen on')
     47                             default=None, help='Port to listen on.')
    4848    option_parser.add_option('-r', '--root',
    4949                             help='Absolute path to DocumentRoot '
    50                                   '(overrides layout test roots)')
     50                                  '(overrides layout test roots).')
    5151    option_parser.add_option('-t', '--tls', dest='use_tls',
    5252                             action='store_true',
    53                              default=False, help='use TLS (wss://)')
     53                             default=False, help='use TLS (wss://).')
    5454    option_parser.add_option('-k', '--private_key', dest='private_key',
    5555                             default='', help='TLS private key file.')
    5656    option_parser.add_option('-c', '--certificate', dest='certificate',
    5757                             default='', help='TLS certificate file.')
     58    option_parser.add_option('--chromium', action='store_true',
     59                             dest='chromium',
     60                             default=False,
     61                             help='Use the Chromium port.')
    5862    option_parser.add_option('--register_cygwin', action="store_true",
    5963                             dest="register_cygwin",
    60                              help='Register Cygwin paths (on Win try bots)')
     64                             help='Register Cygwin paths (on Win try bots).')
    6165    option_parser.add_option('--pidfile', help='path to pid file.')
    6266    option_parser.add_option('--output-dir', dest='output_dir',
    6367                             default=None, help='output directory.')
    6468    option_parser.add_option('-v', '--verbose', action='store_true',
    65                              default=False, help='include debug-level logging')
     69                             default=False,
     70                             help='Include debug-level logging.')
    6671    options, args = option_parser.parse_args()
    6772
     
    8489    if options.certificate:
    8590        kwds['certificate'] = options.certificate
    86     kwds['register_cygwin'] = options.register_cygwin
    8791    if options.pidfile:
    8892        kwds['pidfile'] = options.pidfile
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py

    r58803 r59595  
    415415
    416416    def setup_test_run(self):
    417         """This routine can be overridden to perform any port-specific
    418         work that shouuld be done at the beginning of a test run."""
     417        """Perform port-specific work at the beginning of a test run."""
    419418        pass
     419
     420    def setup_environ_for_server(self):
     421        """Perform port-specific work at the beginning of a server launch.
     422
     423        Returns:
     424           Operating-system's environment.
     425        """
     426        return os.environ
    420427
    421428    def show_html_results_file(self, results_filename):
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_win.py

    r59006 r59595  
    4444    def __init__(self, port_name=None, options=None):
    4545        if port_name is None:
    46             port_name = 'chromium-win' + self.version()
    47         if options and not hasattr(options, 'configuration'):
    48             options.configuration = 'Release'
     46            port_name = "chromium-win" + self.version()
     47        if options and not hasattr(options, "configuration"):
     48            options.configuration = "Release"
    4949        chromium.ChromiumPort.__init__(self, port_name, options)
     50
     51    def setup_environ_for_server(self):
     52        env = chromium.ChromiumPort.setup_environ_for_server(self)
     53        # Put the cygwin directory first in the path to find cygwin1.dll.
     54        env["PATH"] = "%s;%s" % (
     55            self.path_from_chromium_base("third_party", "cygwin", "bin"),
     56            env["PATH"])
     57        # Configure the cygwin directory so that pywebsocket finds proper
     58        # python executable to run cgi program.
     59        env["CYGWIN_PATH"] = self.path_from_chromium_base(
     60            "third_party", "cygwin", "bin")
     61        if (sys.platform == "win32" and self._options and
     62            hasattr(self._options, "register_cygwin") and
     63            self._options.register_cygwin):
     64            setup_mount = self.path_from_chromium_base("third_party",
     65                                                       "cygwin",
     66                                                       "setup_mount.bat")
     67            self._executive.run_command(setup_mount)
     68        return env
    5069
    5170    def baseline_search_path(self):
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/http_server.py

    r58473 r59595  
    5656
    5757    def __init__(self, port_obj, output_dir, background=False, port=None,
    58                  root=None, register_cygwin=None, run_background=None):
     58                 root=None, run_background=None):
    5959        """Args:
    6060          output_dir: the absolute path to the layout test result directory
     
    6666        self._port = port
    6767        self._root = root
    68         self._register_cygwin = register_cygwin
    6968        self._run_background = run_background
    7069        if self._port:
     
    200199                            os.path.join(tmp_module_path, lib_file))
    201200
    202         # Put the cygwin directory first in the path to find cygwin1.dll
    203         env = os.environ
    204         if sys.platform in ('cygwin', 'win32'):
    205             env['PATH'] = '%s;%s' % (
    206                 self._port_obj.path_from_chromium_base('third_party',
    207                                                        'cygwin', 'bin'),
    208                 env['PATH'])
    209 
    210         if sys.platform == 'win32' and self._register_cygwin:
    211             setup_mount = self._port_obj.path_from_chromium_base('third_party',
    212                 'cygwin', 'setup_mount.bat')
    213             # FIXME: Should use Executive.run_command
    214             subprocess.Popen(setup_mount).wait()
    215 
     201        env = self._port_obj.setup_environ_for_server()
    216202        _log.debug('Starting http server')
    217203        # FIXME: Should use Executive.run_command
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py

    r59353 r59595  
    9898    def __init__(self, port_obj, output_dir, port=_DEFAULT_WS_PORT,
    9999                 root=None, use_tls=False,
    100                  register_cygwin=True,
    101100                 pidfile=None):
    102101        """Args:
     
    105104        http_server.Lighttpd.__init__(self, port_obj, output_dir,
    106105                                      port=_DEFAULT_WS_PORT,
    107                                       root=root,
    108                                       register_cygwin=register_cygwin)
     106                                      root=root)
    109107        self._output_dir = output_dir
    110108        self._process = None
     
    189187                              '-c', self._certificate])
    190188
    191         # Put the cygwin directory first in the path to find cygwin1.dll
    192         env = os.environ
    193         if sys.platform in ('cygwin', 'win32'):
    194             env['PATH'] = '%s;%s' % (
    195                 self._port_obj.path_from_chromium_base('third_party',
    196                                                        'cygwin', 'bin'),
    197                 env['PATH'])
    198             env['CYGWIN_PATH'] = self._port_obj.path_from_chromium_base(
    199                 'third_party', 'cygwin', 'bin')
    200 
    201         if sys.platform == 'win32' and self._register_cygwin:
    202             setup_mount = self._port_obj.path_from_chromium_base(
    203                 'third_party', 'cygwin', 'setup_mount.bat')
    204             subprocess.Popen(setup_mount).wait()
    205 
     189        env = self._port_obj.setup_environ_for_server()
    206190        env['PYTHONPATH'] = (pywebsocket_base + os.path.pathsep +
    207191                             env.get('PYTHONPATH', ''))
Note: See TracChangeset for help on using the changeset viewer.