Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(240)

Unified Diff: webkit/tools/layout_tests/layout_package/websocket_server.py

Issue 385131: Fix websocket tests to run. (Closed)
Patch Set: Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | webkit/tools/layout_tests/run_webkit_tests.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/tools/layout_tests/layout_package/websocket_server.py
diff --git a/webkit/tools/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/layout_package/websocket_server.py
index 8df66f081a2ea993890859429f4cc1cd5152c868..054f0871e14439755e323f6c6515eb6bf1efe84a 100644
--- a/webkit/tools/layout_tests/layout_package/websocket_server.py
+++ b/webkit/tools/layout_tests/layout_package/websocket_server.py
@@ -45,10 +45,13 @@ class PyWebSocket(http_server.Lighttpd):
def __init__(self, output_dir, port=_DEFAULT_WS_PORT,
use_tls=False,
private_key=http_server.Lighttpd._pem_file,
- certificate=http_server.Lighttpd._pem_file):
+ certificate=http_server.Lighttpd._pem_file,
+ register_cygwin=None):
"""Args:
output_dir: the absolute path to the layout test result directory
"""
+ http_server.Lighttpd.__init__(self, output_dir, port=port,
+ register_cygwin=register_cygwin)
self._output_dir = output_dir
self._process = None
self._port = port
@@ -163,6 +166,9 @@ if '__main__' == __name__:
default='', help='TLS private key file.')
option_parser.add_option('-c', '--certificate', dest='certificate',
default='', help='TLS certificate file.')
+ option_parser.add_option('--register_cygwin', action="store_true",
+ dest="register_cygwin",
+ help='Register Cygwin paths (on Win try bots)')
options, args = option_parser.parse_args()
if not options.port:
@@ -177,6 +183,7 @@ if '__main__' == __name__:
kwds['private_key'] = options.private_key
if options.certificate:
kwds['certificate'] = options.certificate
+ kwds['register_cygwin'] = options.register_cygwin
pywebsocket = PyWebSocket(tempfile.gettempdir(), **kwds)
pywebsocket.Start()
« no previous file with comments | « no previous file | webkit/tools/layout_tests/run_webkit_tests.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698