summaryrefslogtreecommitdiff
path: root/csharp/test
diff options
context:
space:
mode:
Diffstat (limited to 'csharp/test')
-rwxr-xr-xcsharp/test/Ice/acm/run.py3
-rwxr-xr-xcsharp/test/Ice/adapterDeactivation/run.py5
-rwxr-xr-xcsharp/test/Ice/admin/run.py3
-rwxr-xr-xcsharp/test/Ice/ami/run.py7
-rwxr-xr-xcsharp/test/Ice/background/run.py3
-rwxr-xr-xcsharp/test/Ice/binding/run.py3
-rwxr-xr-xcsharp/test/Ice/checksum/run.py3
-rwxr-xr-xcsharp/test/Ice/dictMapping/run.py11
-rwxr-xr-xcsharp/test/Ice/dispatcher/run.py8
-rwxr-xr-xcsharp/test/Ice/enums/run.py10
-rwxr-xr-xcsharp/test/Ice/exceptions/run.py54
-rwxr-xr-xcsharp/test/Ice/facets/run.py5
-rwxr-xr-xcsharp/test/Ice/hash/run.py1
-rwxr-xr-xcsharp/test/Ice/hold/run.py3
-rwxr-xr-xcsharp/test/Ice/info/run.py3
-rwxr-xr-xcsharp/test/Ice/inheritance/run.py5
-rwxr-xr-xcsharp/test/Ice/invoke/run.py9
-rwxr-xr-xcsharp/test/Ice/location/run.py3
-rwxr-xr-xcsharp/test/Ice/metrics/run.py11
-rwxr-xr-xcsharp/test/Ice/objects/run.py19
-rwxr-xr-xcsharp/test/Ice/operations/run.py19
-rwxr-xr-xcsharp/test/Ice/optional/run.py13
-rwxr-xr-xcsharp/test/Ice/proxy/run.py11
-rwxr-xr-xcsharp/test/Ice/retry/run.py7
-rwxr-xr-xcsharp/test/Ice/seqMapping/run.py11
-rwxr-xr-xcsharp/test/Ice/servantLocator/run.py11
-rwxr-xr-xcsharp/test/Ice/slicing/exceptions/run.py22
-rwxr-xr-xcsharp/test/Ice/slicing/objects/run.py22
-rw-r--r--csharp/test/Ice/threadPoolPriority/run.py3
-rwxr-xr-xcsharp/test/Ice/timeout/run.py3
30 files changed, 147 insertions, 144 deletions
diff --git a/csharp/test/Ice/acm/run.py b/csharp/test/Ice/acm/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/acm/run.py
+++ b/csharp/test/Ice/acm/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/adapterDeactivation/run.py b/csharp/test/Ice/adapterDeactivation/run.py
index ac7bc7f799e..5eabdba41f2 100755
--- a/csharp/test/Ice/adapterDeactivation/run.py
+++ b/csharp/test/Ice/adapterDeactivation/run.py
@@ -20,5 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/admin/run.py b/csharp/test/Ice/admin/run.py
index 74d2e5d1724..aeb71ef588e 100755
--- a/csharp/test/Ice/admin/run.py
+++ b/csharp/test/Ice/admin/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/ami/run.py b/csharp/test/Ice/ami/run.py
index 73dc16e6fc7..5eabdba41f2 100755
--- a/csharp/test/Ice/ami/run.py
+++ b/csharp/test/Ice/ami/run.py
@@ -20,7 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/background/run.py b/csharp/test/Ice/background/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/background/run.py
+++ b/csharp/test/Ice/background/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/binding/run.py b/csharp/test/Ice/binding/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/binding/run.py
+++ b/csharp/test/Ice/binding/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/checksum/run.py b/csharp/test/Ice/checksum/run.py
index c47b07bcb45..e852e8a9605 100755
--- a/csharp/test/Ice/checksum/run.py
+++ b/csharp/test/Ice/checksum/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest(server = os.path.join(os.getcwd(), "server", "server"))
+TestUtil.queueClientServerTest(server = os.path.join(os.getcwd(), "server", "server"))
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/dictMapping/run.py b/csharp/test/Ice/dictMapping/run.py
index eec082f03e5..d25963849a4 100755
--- a/csharp/test/Ice/dictMapping/run.py
+++ b/csharp/test/Ice/dictMapping/run.py
@@ -20,9 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with AMD server.")
-TestUtil.clientServerTest(server="serveramd")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ server="serveramd")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/dispatcher/run.py b/csharp/test/Ice/dispatcher/run.py
index 8f5fa2b1152..5eabdba41f2 100755
--- a/csharp/test/Ice/dispatcher/run.py
+++ b/csharp/test/Ice/dispatcher/run.py
@@ -20,8 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with collocated server.")
-TestUtil.collocatedTest()
-
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/enums/run.py b/csharp/test/Ice/enums/run.py
index 614bfe363bf..e53c6cc89a3 100755
--- a/csharp/test/Ice/enums/run.py
+++ b/csharp/test/Ice/enums/run.py
@@ -20,9 +20,9 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-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 test with 1.1 encoding.")
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest(configName = "1.1", message = "Running test with 1.1 encoding.")
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/exceptions/run.py b/csharp/test/Ice/exceptions/run.py
index 57808be6caf..608504d18da 100755
--- a/csharp/test/Ice/exceptions/run.py
+++ b/csharp/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()
diff --git a/csharp/test/Ice/facets/run.py b/csharp/test/Ice/facets/run.py
index ac7bc7f799e..5eabdba41f2 100755
--- a/csharp/test/Ice/facets/run.py
+++ b/csharp/test/Ice/facets/run.py
@@ -20,5 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/hash/run.py b/csharp/test/Ice/hash/run.py
index 1b4279c449b..3a9fbc10e17 100755
--- a/csharp/test/Ice/hash/run.py
+++ b/csharp/test/Ice/hash/run.py
@@ -21,4 +21,3 @@ sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
TestUtil.simpleTest()
-
diff --git a/csharp/test/Ice/hold/run.py b/csharp/test/Ice/hold/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/hold/run.py
+++ b/csharp/test/Ice/hold/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/info/run.py b/csharp/test/Ice/info/run.py
index 74d2e5d1724..aeb71ef588e 100755
--- a/csharp/test/Ice/info/run.py
+++ b/csharp/test/Ice/info/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/inheritance/run.py b/csharp/test/Ice/inheritance/run.py
index ac7bc7f799e..5eabdba41f2 100755
--- a/csharp/test/Ice/inheritance/run.py
+++ b/csharp/test/Ice/inheritance/run.py
@@ -20,5 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/invoke/run.py b/csharp/test/Ice/invoke/run.py
index e3172b537ae..cee6489ddad 100755
--- a/csharp/test/Ice/invoke/run.py
+++ b/csharp/test/Ice/invoke/run.py
@@ -20,8 +20,7 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with Blobject server.")
-TestUtil.clientServerTest()
-
-print("tests with BlobjectAsync server.")
-TestUtil.clientServerTest(additionalServerOptions = "--async")
+TestUtil.queueClientServerTest(configName = "blobject", message = "Running test with Blobject server.")
+TestUtil.queueClientServerTest(configName = "blobjectAsync", message = "Running test with BlobjectAsync server.",
+ additionalServerOptions = "--async")
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/location/run.py b/csharp/test/Ice/location/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/location/run.py
+++ b/csharp/test/Ice/location/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/metrics/run.py b/csharp/test/Ice/metrics/run.py
index eadac777a2c..67e01ac5bbd 100755
--- a/csharp/test/Ice/metrics/run.py
+++ b/csharp/test/Ice/metrics/run.py
@@ -20,9 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with AMD server.")
-TestUtil.clientServerTest(server = "serveramd")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ server = "serveramd")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/objects/run.py b/csharp/test/Ice/objects/run.py
index bad83a5b610..b435bbdbdcf 100755
--- a/csharp/test/Ice/objects/run.py
+++ b/csharp/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()
diff --git a/csharp/test/Ice/operations/run.py b/csharp/test/Ice/operations/run.py
index 08eda9b1ee1..d81e4ead8b8 100755
--- a/csharp/test/Ice/operations/run.py
+++ b/csharp/test/Ice/operations/run.py
@@ -20,13 +20,12 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0")
-print("tests with AMD server.")
-TestUtil.clientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramd")
-print("tests with TIE server.")
-TestUtil.clientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0", server="servertie")
-print("tests with AMD TIE server.")
-TestUtil.clientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramdtie")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest(additionalClientOptions = "--Ice.Warn.AMICallback=0")
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramd")
+TestUtil.queueClientServerTest(configName = "tie", message = "Running test with TIE server.",
+ additionalClientOptions = "--Ice.Warn.AMICallback=0", server="servertie")
+TestUtil.queueClientServerTest(configName = "amdTie", localOnly = True, message = "Running test with AMD TIE server.",
+ additionalClientOptions = "--Ice.Warn.AMICallback=0", server="serveramdtie")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/optional/run.py b/csharp/test/Ice/optional/run.py
index 95214f14a11..0800854ef5c 100755
--- a/csharp/test/Ice/optional/run.py
+++ b/csharp/test/Ice/optional/run.py
@@ -20,9 +20,10 @@ 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 AMD server.")
-TestUtil.clientServerTest(server="serveramd")
+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 = "amd", localOnly = True, message = "Running test with AMD server.",
+ server="serveramd")
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/proxy/run.py b/csharp/test/Ice/proxy/run.py
index eec082f03e5..d25963849a4 100755
--- a/csharp/test/Ice/proxy/run.py
+++ b/csharp/test/Ice/proxy/run.py
@@ -20,9 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with AMD server.")
-TestUtil.clientServerTest(server="serveramd")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ server="serveramd")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/retry/run.py b/csharp/test/Ice/retry/run.py
index 73dc16e6fc7..5eabdba41f2 100755
--- a/csharp/test/Ice/retry/run.py
+++ b/csharp/test/Ice/retry/run.py
@@ -20,7 +20,6 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/seqMapping/run.py b/csharp/test/Ice/seqMapping/run.py
index eec082f03e5..d25963849a4 100755
--- a/csharp/test/Ice/seqMapping/run.py
+++ b/csharp/test/Ice/seqMapping/run.py
@@ -20,9 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with AMD server.")
-TestUtil.clientServerTest(server="serveramd")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ server="serveramd")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/servantLocator/run.py b/csharp/test/Ice/servantLocator/run.py
index e80167930ef..e0e979ea9c2 100755
--- a/csharp/test/Ice/servantLocator/run.py
+++ b/csharp/test/Ice/servantLocator/run.py
@@ -20,9 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("tests with regular server.")
-TestUtil.clientServerTest()
-print("tests with AMD server.")
-TestUtil.clientServerTest(server="serveramd")
-print("tests with collocated server.")
-TestUtil.collocatedTest()
+TestUtil.queueClientServerTest()
+TestUtil.queueClientServerTest(configName = "amd", localOnly = True, message = "Running test with AMD server.",
+ server="serveramd")
+TestUtil.queueCollocatedTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/slicing/exceptions/run.py b/csharp/test/Ice/slicing/exceptions/run.py
index 53eee80b8f3..0e3aa2f01bc 100755
--- a/csharp/test/Ice/slicing/exceptions/run.py
+++ b/csharp/test/Ice/slicing/exceptions/run.py
@@ -20,17 +20,17 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("Running test with sliced format.")
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest(configName = "sliced", message = "Running test with sliced format.")
-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 test with sliced format and AMD server.")
-TestUtil.clientServerTest(server="serveramd")
+TestUtil.queueClientServerTest(configName = "slicedAMD", localOnly = True,
+ message = "Running test with sliced format and AMD server.", server="serveramd")
-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")
+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.runQueuedTests()
diff --git a/csharp/test/Ice/slicing/objects/run.py b/csharp/test/Ice/slicing/objects/run.py
index 53eee80b8f3..0e3aa2f01bc 100755
--- a/csharp/test/Ice/slicing/objects/run.py
+++ b/csharp/test/Ice/slicing/objects/run.py
@@ -20,17 +20,17 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-print("Running test with sliced format.")
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest(configName = "sliced", message = "Running test with sliced format.")
-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 test with sliced format and AMD server.")
-TestUtil.clientServerTest(server="serveramd")
+TestUtil.queueClientServerTest(configName = "slicedAMD", localOnly = True,
+ message = "Running test with sliced format and AMD server.", server="serveramd")
-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")
+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.runQueuedTests()
diff --git a/csharp/test/Ice/threadPoolPriority/run.py b/csharp/test/Ice/threadPoolPriority/run.py
index 3f2e91f0009..5c9bb399cb3 100644
--- a/csharp/test/Ice/threadPoolPriority/run.py
+++ b/csharp/test/Ice/threadPoolPriority/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
diff --git a/csharp/test/Ice/timeout/run.py b/csharp/test/Ice/timeout/run.py
index 3f2e91f0009..5c9bb399cb3 100755
--- a/csharp/test/Ice/timeout/run.py
+++ b/csharp/test/Ice/timeout/run.py
@@ -20,4 +20,5 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil
-TestUtil.clientServerTest()
+TestUtil.queueClientServerTest()
+TestUtil.runQueuedTests()
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 22:05:37 +0000