summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/objects/run.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
committerMark Spruiell <mes@zeroc.com>2015-12-17 11:45:27 -0800
commit884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch)
tree53d2123abf22042f827d0e83b6093cea038c3b3a /cpp/test/Ice/objects/run.py
parentMerge branch '3.6' (diff)
downloadice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.bz2
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.tar.xz
ice-884e2be89b0cd997f372c59f05bf05a9a5372b60.zip
Fixes for Bluetooth plug-ins.
Updates to testsuite to support Bluetooth and remote servers.
Diffstat (limited to 'cpp/test/Ice/objects/run.py')
-rwxr-xr-xcpp/test/Ice/objects/run.py19
1 files changed, 9 insertions, 10 deletions
diff --git a/cpp/test/Ice/objects/run.py b/cpp/test/Ice/objects/run.py
index 6014ec1878d..bb0c4f5e11e 100755
--- a/cpp/test/Ice/objects/run.py
+++ b/cpp/test/Ice/objects/run.py
@@ -20,16 +20,15 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("Running test with compact (default) format.")
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest(configName = "compact", message = "Running test with compact (default) format.")
-print("Running test with sliced format.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.SlicedFormat",
- additionalServerOptions="--Ice.Default.SlicedFormat")
+TestUtil.queueClientServerTest(configName = "sliced", message = "Running test with sliced format.",
+ additionalClientOptions="--Ice.Default.SlicedFormat",
+ additionalServerOptions="--Ice.Default.SlicedFormat")
-print("Running test with 1.0 encoding.")
-TestUtil.clientServerTest(additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
- additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+TestUtil.queueClientServerTest(configName = "1.0", message = "Running test with 1.0 encoding.",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
-print("Running collocated test.")
-TestUtil.collocatedTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()