diff options
| author | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-27 03:42:21 +0000 |
|---|---|---|
| committer | yuzo@chromium.org <yuzo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-27 03:42:21 +0000 |
| commit | 03bffc82ff24f725134e161cbcafb20095639b3d (patch) | |
| tree | ab1e02f1968a5963b17e4415e07d4eec8a904650 | |
| parent | 7c6abbb5a6a856020ce3e6183d7d54a775101aec (diff) | |
| download | chromium_src-03bffc82ff24f725134e161cbcafb20095639b3d.zip chromium_src-03bffc82ff24f725134e161cbcafb20095639b3d.tar.gz chromium_src-03bffc82ff24f725134e161cbcafb20095639b3d.tar.bz2 | |
Use the pywebsocket copy contained in WebKit rather than fetching Chromium's
own copy using DEPS. This is to avoid pywebsocket version mismatch.
If in the future WebKit supports DEPS-like mechanism, we should switch
back to DEPS-based approach.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/444014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33216 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 6 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/websocket_server.py | 9 |
2 files changed, 10 insertions, 5 deletions
@@ -34,9 +34,6 @@ deps = { "src/third_party/protobuf2/src": "http://protobuf.googlecode.com/svn/trunk@219", - "src/third_party/pywebsocket": - "http://pywebsocket.googlecode.com/svn/trunk/src@119", - "src/tools/gyp": "http://gyp.googlecode.com/svn/trunk@762", @@ -64,6 +61,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/ots": "http://ots.googlecode.com/svn/trunk@19", diff --git a/webkit/tools/layout_tests/layout_package/websocket_server.py b/webkit/tools/layout_tests/layout_package/websocket_server.py index 5e5e4f5..8f27778 100644 --- a/webkit/tools/layout_tests/layout_package/websocket_server.py +++ b/webkit/tools/layout_tests/layout_package/websocket_server.py @@ -93,14 +93,19 @@ class PyWebSocket(http_server.Lighttpd): RemoveLogFiles(self._output_dir, log_prefix) python_interp = sys.executable - pywebsocket_base = path_utils.PathFromBase('third_party', 'pywebsocket') + pywebsocket_base = path_utils.PathFromBase( + 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket') pywebsocket_script = path_utils.PathFromBase( - 'third_party', 'pywebsocket', 'mod_pywebsocket', 'standalone.py') + 'third_party', 'WebKit', 'WebKitTools', 'pywebsocket', + 'mod_pywebsocket', 'standalone.py') start_cmd = [ python_interp, pywebsocket_script, '-p', str(self._port), '-d', self._layout_tests, '-s', self._web_socket_tests, + # Uncomment the following log option when we start using + # WebKit r51406 or later. + # '-l', error_log, ] if self._use_tls: start_cmd.extend(['-t', '-k', self._private_key, |