diff options
| -rw-r--r-- | DEPS | 5 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/webkitpy/layout_tests/layout_package/websocket_server.py | 8 |
2 files changed, 7 insertions, 6 deletions
@@ -1,7 +1,7 @@ vars = { "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk", - "webkit_revision": "55310", + "webkit_revision": "55250", "ffmpeg_revision": "39607", "skia_revision": "504", "chromium_git": "http://src.chromium.org/git", @@ -64,6 +64,9 @@ deps = { "src/third_party/WebKit/WebKit/chromium": Var("webkit_trunk") + "/WebKit/chromium@" + Var("webkit_revision"), + "src/third_party/WebKit/WebKitTools/pywebsocket": + Var("webkit_trunk") + "/WebKitTools/pywebsocket@" + Var("webkit_revision"), + "src/third_party/WebKit/WebKitTools/Scripts": Var("webkit_trunk") + "/WebKitTools/Scripts@" + Var("webkit_revision"), 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 8424530..6c74c30 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,12 +117,10 @@ class PyWebSocket(http_server.Lighttpd): python_interp = sys.executable pywebsocket_base = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'Scripts', - 'webkitpy', 'thirdparty', 'pywebsocket') + 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket') pywebsocket_script = path_utils.path_from_base( - 'third_party', 'WebKit', 'WebKitTools', 'Scripts', - 'webkitpy', 'thirdparty', 'pywebsocket', 'mod_pywebsocket', - 'standalone.py') + 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket', + 'mod_pywebsocket', 'standalone.py') start_cmd = [ python_interp, pywebsocket_script, '-p', str(self._port), |