diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKitTools/Scripts/run-webkit-websocketserver | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKitTools/Scripts/run-webkit-websocketserver')
| -rwxr-xr-x | WebKitTools/Scripts/run-webkit-websocketserver | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/WebKitTools/Scripts/run-webkit-websocketserver b/WebKitTools/Scripts/run-webkit-websocketserver index 64a724d..06f9079 100755 --- a/WebKitTools/Scripts/run-webkit-websocketserver +++ b/WebKitTools/Scripts/run-webkit-websocketserver @@ -64,18 +64,19 @@ exit 0; sub openWebSocketServer() { my $webSocketServerPath = "/usr/bin/python"; - my $webSocketPythonPath = "$srcDir/WebKitTools/pywebsocket"; + my $webSocketPythonPath = "$srcDir/WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket"; my $webSocketHandlerDir = "$testDirectory"; my $webSocketHandlerScanDir = "$testDirectory/websocket/tests"; my $webSocketHandlerMapFile = "$webSocketHandlerScanDir/handler_map.txt"; my @args = ( - "$srcDir/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py", - "-p", "$webSocketPort", - "-d", "$webSocketHandlerDir", - "-s", "$webSocketHandlerScanDir", - "-m", "$webSocketHandlerMapFile", - "-x", "/websocket/tests/cookies", + "$srcDir/WebKitTools/Scripts/webkitpy/thirdparty/pywebsocket/mod_pywebsocket/standalone.py", + "--server-host", "127.0.0.1", + "--port", "$webSocketPort", + "--document-root", "$webSocketHandlerDir", + "--scan-dir", "$webSocketHandlerScanDir", + "--websock-handlers-map-file", "$webSocketHandlerMapFile", + "--cgi-paths", "/websocket/tests", ); $ENV{"PYTHONPATH"} = $webSocketPythonPath; |