summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/activation/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/IceGrid/activation/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/IceGrid/activation/run.py')
-rwxr-xr-xcpp/test/IceGrid/activation/run.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py
index cf2f6b84798..fd524992104 100755
--- a/cpp/test/IceGrid/activation/run.py
+++ b/cpp/test/IceGrid/activation/run.py
@@ -20,5 +20,8 @@ if len(path) == 0:
sys.path.append(os.path.join(path[0], "scripts"))
import TestUtil, IceGridAdmin
-IceGridAdmin.iceGridTest("application.xml", "", "properties-override='%s' icegridnode.exe='%s'" %
- (IceGridAdmin.iceGridNodePropertiesOverride(), TestUtil.getIceGridNode()))
+IceGridAdmin.iceGridTest("application.xml",
+ applicationOptions = ("properties-override='%s' icegridnode.exe='%s' server.dir='%s'" %
+ (IceGridAdmin.iceGridNodePropertiesOverride(),
+ TestUtil.getIceGridNode(),
+ TestUtil.getTestDirectory("server"))))