diff options
Diffstat (limited to 'WebKitTools/Scripts/new-run-webkit-websocketserver')
| -rw-r--r-- | WebKitTools/Scripts/new-run-webkit-websocketserver | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/WebKitTools/Scripts/new-run-webkit-websocketserver b/WebKitTools/Scripts/new-run-webkit-websocketserver index 8e4aeaa..4f6deaa 100644 --- a/WebKitTools/Scripts/new-run-webkit-websocketserver +++ b/WebKitTools/Scripts/new-run-webkit-websocketserver @@ -42,25 +42,32 @@ def main(): option_parser = optparse.OptionParser() option_parser.add_option('--server', type='choice', choices=['start', 'stop'], default='start', - help='Server action (start|stop)') + help='Server action (start|stop).') option_parser.add_option('-p', '--port', dest='port', - default=None, help='Port to listen on') + default=None, help='Port to listen on.') option_parser.add_option('-r', '--root', help='Absolute path to DocumentRoot ' - '(overrides layout test roots)') + '(overrides layout test roots).') option_parser.add_option('-t', '--tls', dest='use_tls', action='store_true', - default=False, help='use TLS (wss://)') + default=False, help='use TLS (wss://).') option_parser.add_option('-k', '--private_key', dest='private_key', default='', help='TLS private key file.') 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", - help='Register Cygwin paths (on Win try bots)') + help='Register Cygwin paths (on Win try bots).') option_parser.add_option('--pidfile', help='path to pid file.') + option_parser.add_option('--output-dir', dest='output_dir', + default=None, help='output directory.') option_parser.add_option('-v', '--verbose', action='store_true', - default=False, help='include debug-level logging') + default=False, + help='Include debug-level logging.') options, args = option_parser.parse_args() if not options.port: @@ -71,6 +78,9 @@ def main(): # FIXME: We shouldn't grab at this private variable. options.port = websocket_server._DEFAULT_WS_PORT + if not options.output_dir: + options.output_dir = tempfile.gettempdir() + kwds = {'port': options.port, 'use_tls': options.use_tls} if options.root: kwds['root'] = options.root @@ -78,12 +88,11 @@ def main(): kwds['private_key'] = options.private_key if options.certificate: kwds['certificate'] = options.certificate - kwds['register_cygwin'] = options.register_cygwin if options.pidfile: kwds['pidfile'] = options.pidfile port_obj = factory.get() - pywebsocket = websocket_server.PyWebSocket(port_obj, tempfile.gettempdir(), **kwds) + pywebsocket = websocket_server.PyWebSocket(port_obj, options.output_dir, **kwds) log_level = logging.WARN if options.verbose: |