summaryrefslogtreecommitdiff
path: root/scripts/TestUtil.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2012-11-23 00:57:31 +0100
committerJose <jose@zeroc.com>2012-11-23 00:57:31 +0100
commit33dd4da308f109560160bb0485a551a0bef81975 (patch)
tree61cb004250bb2fddf697396bde4f3de5b54d73a0 /scripts/TestUtil.py
parentINSTALL.WINRT add instructions to run SSL tests (diff)
downloadice-33dd4da308f109560160bb0485a551a0bef81975.tar.bz2
ice-33dd4da308f109560160bb0485a551a0bef81975.tar.xz
ice-33dd4da308f109560160bb0485a551a0bef81975.zip
Fixed (ICE-4989) run.py --server runs client and server
Diffstat (limited to 'scripts/TestUtil.py')
-rwxr-xr-xscripts/TestUtil.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py
index fa7d8cd849f..0929e570c09 100755
--- a/scripts/TestUtil.py
+++ b/scripts/TestUtil.py
@@ -1260,7 +1260,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "",
server = getCommandLine(server, serverCfg, additionalServerOptions)
serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx)
print("ok")
-
+
if not serverOnly:
if clientLang == lang:
sys.stdout.write("starting %s... " % clientDesc)
@@ -1591,6 +1591,8 @@ def processCmdLine():
if args:
usage()
+ global serverOnly
+ global winrt
for o, a in opts:
if o == "--ice-home":
global iceHome