summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/slicing/objects/run.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-02-26 20:46:27 +0100
committerJose <jose@zeroc.com>2016-02-26 20:46:27 +0100
commit62cba8cd46a535585a4422daab489f114feab6f3 (patch)
treec77e9cec24a570b06024a3c6a1552b8e6eb20ec6 /cpp/test/Ice/slicing/objects/run.py
parentupdating changelog for ICE-6844 (diff)
downloadice-62cba8cd46a535585a4422daab489f114feab6f3.tar.bz2
ice-62cba8cd46a535585a4422daab489f114feab6f3.tar.xz
ice-62cba8cd46a535585a4422daab489f114feab6f3.zip
Windows msbuild build updates
Diffstat (limited to 'cpp/test/Ice/slicing/objects/run.py')
-rwxr-xr-xcpp/test/Ice/slicing/objects/run.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/test/Ice/slicing/objects/run.py b/cpp/test/Ice/slicing/objects/run.py
index 259f9e67acb..7657b57b48c 100755
--- a/cpp/test/Ice/slicing/objects/run.py
+++ b/cpp/test/Ice/slicing/objects/run.py
@@ -23,15 +23,15 @@ import TestUtil
TestUtil.queueClientServerTest(configName = "sliced", message = "Running test with sliced format.")
TestUtil.queueClientServerTest(configName = "1.0", message = "Running test with 1.0 encoding.",
- additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
TestUtil.queueClientServerTest(configName = "slicedAMD", localOnly = True,
- message = "Running test with sliced format and AMD server.", server="serveramd")
+ message = "Running test with sliced format and AMD server.", server=TestUtil.getTestExecutable("serveramd"))
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",
+ server=TestUtil.getTestExecutable("serveramd"),
+ additionalClientOptions="--Ice.Default.EncodingVersion=1.0",
additionalServerOptions="--Ice.Default.EncodingVersion=1.0")
TestUtil.runQueuedTests()