summaryrefslogtreecommitdiff
path: root/js/test/Common/run.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-11-10 12:49:45 +0100
committerJose <jose@zeroc.com>2014-11-10 12:49:45 +0100
commit07d42c8619eccb03ef87f3a964746c3ed170759c (patch)
tree492419d01ac3e9435b8b6aaf6f35e6c3d1e406c8 /js/test/Common/run.py
parentFixed (ICE-5856) - IceJS browser test Ice/timeout fails on Chrome (diff)
downloadice-07d42c8619eccb03ef87f3a964746c3ed170759c.tar.bz2
ice-07d42c8619eccb03ef87f3a964746c3ed170759c.tar.xz
ice-07d42c8619eccb03ef87f3a964746c3ed170759c.zip
Fixed (ICE-5855) - IceJS exceptionBidir passes but prints all the exceptions in the server console
Diffstat (limited to 'js/test/Common/run.py')
-rwxr-xr-xjs/test/Common/run.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/test/Common/run.py b/js/test/Common/run.py
index 13e9fe76d77..a0975bf303f 100755
--- a/js/test/Common/run.py
+++ b/js/test/Common/run.py
@@ -84,7 +84,7 @@ class ControllerI(Test.Controller):
def __init__(self):
self.currentServer = None
- def runServer(self, lang, name, protocol, host, current):
+ def runServer(self, lang, name, protocol, host, options, current):
# If server is still running, terminate it
if self.currentServer:
@@ -112,7 +112,7 @@ class ControllerI(Test.Controller):
serverCfg = TestUtil.DriverConfig("server")
serverCfg.protocol = protocol
serverCfg.host = host
- server = TestUtil.getCommandLine(server, serverCfg)
+ server = TestUtil.getCommandLine(server, serverCfg, options)
serverProc = TestUtil.spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx)
print("ok")
finally: