1 files changed, 28 insertions, 26 deletions
diff --git a/cpp/test/Ice/exceptions/run.py b/cpp/test/Ice/exceptions/run.py
index b90a1b41d48..95919818241 100755
--- a/cpp/test/Ice/exceptions/run.py
+++ b/cpp/test/Ice/exceptions/run.py
@@ -20,29 +20,31 @@ if len(path) == 0:
 sys.path.append(os.path.join(path[0], "scripts"))
 import TestUtil
 
-print("Running test with compact (default) format.")
-TestUtil.clientServerTest()
-
-print("Running test with sliced format.")
-TestUtil.clientServerTest(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")
-
-print("Running test with compact (default) format and AMD server.")
-TestUtil.clientServerTest(server="serveramd")
-
-print("Running test with sliced format and AMD server.")
-TestUtil.clientServerTest(server="serveramd", 
-                          additionalClientOptions="--Ice.Default.SlicedFormat", 
-                          additionalServerOptions="--Ice.Default.SlicedFormat")
-
-print("Running test with 1.0 encoding and AMD server.")
-TestUtil.clientServerTest(server="serveramd", 
-                          additionalClientOptions="--Ice.Default.EncodingVersion=1.0", 
-                          additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
-
-print("Running collocated test.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest(configName = "compact", message = "Running test with compact (default) format.")
+
+TestUtil.queueClientServerTest(configName = "sliced", message = "Running test with sliced format.",
+                               additionalClientOptions="--Ice.Default.SlicedFormat", 
+                               additionalServerOptions="--Ice.Default.SlicedFormat")
+
+TestUtil.queueClientServerTest(configName = "1.0", message = "Running test with 1.0 encoding.",
+                               additionalClientOptions="--Ice.Default.EncodingVersion=1.0", 
+                               additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
+TestUtil.queueClientServerTest(configName = "compactAMD", localOnly = True,
+                               message = "Running test with compact (default) format and AMD server.",
+                               server="serveramd")
+
+TestUtil.queueClientServerTest(configName = "slicedAMD", localOnly = True,
+                               message = "Running test with sliced format and AMD server.",
+                               server="serveramd", 
+                               additionalClientOptions="--Ice.Default.SlicedFormat", 
+                               additionalServerOptions="--Ice.Default.SlicedFormat")
+
+TestUtil.queueClientServerTest(configName = "1.0AMD", localOnly = True,
+                               message = "Running test with 1.0 encoding and AMD server.",
+                               server="serveramd", 
+                               additionalClientOptions="--Ice.Default.EncodingVersion=1.0", 
+                               additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
+
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()