summaryrefslogtreecommitdiffstats
path: root/WebKitTools/Scripts/run-webkit-websocketserver
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2010-02-02 14:57:50 +0000
committerSteve Block <steveblock@google.com>2010-02-04 15:06:55 +0000
commitd0825bca7fe65beaee391d30da42e937db621564 (patch)
tree7461c49eb5844ffd1f35d1ba2c8b7584c1620823 /WebKitTools/Scripts/run-webkit-websocketserver
parent3db770bd97c5a59b6c7574ca80a39e5a51c1defd (diff)
downloadexternal_webkit-d0825bca7fe65beaee391d30da42e937db621564.zip
external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.gz
external_webkit-d0825bca7fe65beaee391d30da42e937db621564.tar.bz2
Merge webkit.org at r54127 : Initial merge by git
Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
Diffstat (limited to 'WebKitTools/Scripts/run-webkit-websocketserver')
-rwxr-xr-xWebKitTools/Scripts/run-webkit-websocketserver2
1 files changed, 2 insertions, 0 deletions
diff --git a/WebKitTools/Scripts/run-webkit-websocketserver b/WebKitTools/Scripts/run-webkit-websocketserver
index e05303a..bbc5af6 100755
--- a/WebKitTools/Scripts/run-webkit-websocketserver
+++ b/WebKitTools/Scripts/run-webkit-websocketserver
@@ -67,12 +67,14 @@ sub openWebSocketServer()
my $webSocketPythonPath = "$srcDir/WebKitTools/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",
);
$ENV{"PYTHONPATH"} = $webSocketPythonPath;