diff options
Diffstat (limited to 'WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py')
| -rw-r--r-- | WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py index 7346671..926bc04 100644 --- a/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py +++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/websocket_server.py @@ -124,12 +124,13 @@ class PyWebSocket(http_server.Lighttpd): if self._root: self._layout_tests = os.path.abspath(self._root) self._web_socket_tests = os.path.abspath( - os.path.join(self._root, 'websocket', 'tests')) + os.path.join(self._root, 'http', 'tests', + 'websocket', 'tests')) else: try: self._layout_tests = self._port_obj.layout_tests_dir() self._web_socket_tests = os.path.join(self._layout_tests, - 'websocket', 'tests') + 'http', 'tests', 'websocket', 'tests') except: self._web_socket_tests = None @@ -164,10 +165,10 @@ class PyWebSocket(http_server.Lighttpd): pywebsocket_script = os.path.join(pywebsocket_base, 'mod_pywebsocket', 'standalone.py') start_cmd = [ - python_interp, pywebsocket_script, + python_interp, '-u', pywebsocket_script, '--server-host', '127.0.0.1', '--port', str(self._port), - '--document-root', self._layout_tests, + '--document-root', os.path.join(self._layout_tests, 'http', 'tests'), '--scan-dir', self._web_socket_tests, '--cgi-paths', '/websocket/tests', '--log-file', error_log, |