diff options
| author | Jose <jose@zeroc.com> | 2015-01-22 19:16:43 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-01-22 19:16:43 +0100 |
| commit | f623cdba8d3dcf801b1483e15b5f0cb19ac77b4a (patch) | |
| tree | 6cf5de43bbad54c89ed9fe232180062d48dba5d2 /scripts/TestUtil.py | |
| parent | ICE-6279 OBjC: use servant factory methods (diff) | |
| download | ice-f623cdba8d3dcf801b1483e15b5f0cb19ac77b4a.tar.bz2 ice-f623cdba8d3dcf801b1483e15b5f0cb19ac77b4a.tar.xz ice-f623cdba8d3dcf801b1483e15b5f0cb19ac77b4a.zip | |
Port test controller server to Java
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 9c67a18d863..883a7623e89 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1458,6 +1458,7 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "", server = getCommandLine(server, serverCfg, additionalServerOptions) serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx) print("ok") + sys.stdout.flush() if not serverOnly: if clientLang == lang: @@ -1479,6 +1480,9 @@ def clientServerTest(additionalServerOptions = "", additionalClientOptions = "", appVerifierAfterTestEnd([clientExe, serverExe]) def collocatedTest(additionalOptions = ""): + if serverOnly: + print("** skipping collocated test") + return lang = getDefaultMapping() if len(cross) > 0 and cross[0] != lang: print("** skipping cross test") @@ -1589,6 +1593,7 @@ def clientEchoTest(additionalServerOptions = "", additionalClientOptions = "", server = getCommandLine(server, serverCfg, additionalServerOptions) serverProc = spawnServer(server, env = serverenv, lang=serverCfg.lang, mx=serverCfg.mx) print("ok") + sys.stdout.flush() if not serverOnly: if clientLang == lang: |