diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-12-17 11:45:27 -0800 |
| commit | 884e2be89b0cd997f372c59f05bf05a9a5372b60 (patch) | |
| tree | 53d2123abf22042f827d0e83b6093cea038c3b3a /csharp/test/Ice/exceptions/run.py | |
| parent | Merge branch '3.6' (diff) | |
| download | ice-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 'csharp/test/Ice/exceptions/run.py')
| -rwxr-xr-x | csharp/test/Ice/exceptions/run.py | 54 |
1 files changed, 28 insertions, 26 deletions
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() |