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/operations/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/operations/run.py')
| -rwxr-xr-x | csharp/test/Ice/operations/run.py | 19 |
1 files changed, 9 insertions, 10 deletions
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() |