diff options
| author | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 23:37:58 +0000 |
|---|---|---|
| committer | dumi@chromium.org <dumi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-26 23:37:58 +0000 |
| commit | ef37e08636e4d5e4be1aa4b14a9e2d3d57fc2cfb (patch) | |
| tree | 27574409f8ef603caad5c89d8128a08ef78feb36 /webkit/tools/layout_tests/webkitpy | |
| parent | 73122c94973001ab8f510396e2d82e91449e704e (diff) | |
| download | chromium_src-ef37e08636e4d5e4be1aa4b14a9e2d3d57fc2cfb.zip chromium_src-ef37e08636e4d5e4be1aa4b14a9e2d3d57fc2cfb.tar.gz chromium_src-ef37e08636e4d5e4be1aa4b14a9e2d3d57fc2cfb.tar.bz2 | |
WebKit roll 55250:55310. Also, fix the paths to the WebKit buildbot scripts.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/660205
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/webkitpy')
| -rw-r--r-- | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py index 6c74c30..8424530 100644 --- a/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py +++ b/webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py @@ -117,10 +117,12 @@ class PyWebSocket(http_server.Lighttpd): python_interp = sys.executable pywebsocket_base = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket') + 'third_party', 'WebKit', 'WebKitTools', 'Scripts', + 'webkitpy', 'thirdparty', 'pywebsocket') pywebsocket_script = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket', - 'mod_pywebsocket', 'standalone.py') + 'third_party', 'WebKit', 'WebKitTools', 'Scripts', + 'webkitpy', 'thirdparty', 'pywebsocket', 'mod_pywebsocket', + 'standalone.py') start_cmd = [ python_interp, pywebsocket_script, '-p', str(self._port), |