summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/replication/run.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-12-04 16:23:28 +0100
committerJose <jose@zeroc.com>2014-12-04 16:23:28 +0100
commit39126e8f5f7a54be60fedc6ac73cc1105c669e6f (patch)
treefdd97e0eb6fdc8c9f8bf8732218a335770c3de1a /cpp/test/IceGrid/replication/run.py
parentFixed issue from previous commit, removed all references to getIceVersion (diff)
downloadice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.bz2
ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.tar.xz
ice-39126e8f5f7a54be60fedc6ac73cc1105c669e6f.zip
Fixed (ICE-6057) - VS2012: IceGrid\customLoadBalancing fails
Diffstat (limited to 'cpp/test/IceGrid/replication/run.py')
-rwxr-xr-xcpp/test/IceGrid/replication/run.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index c8d09bdf624..c518c9f4477 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -22,7 +22,8 @@ import TestUtil, IceGridAdmin
TestUtil.addLdPath(os.getcwd())
-variables = "properties-override='%s'" % IceGridAdmin.iceGridNodePropertiesOverride()
+variables = ("properties-override='%s' icegridnode.exe='%s' icegridregistry.exe='%s'" %
+ (IceGridAdmin.iceGridNodePropertiesOverride(), TestUtil.getIceGridNode(), TestUtil.getIceGridRegistry()))
IceGridAdmin.iceGridTest("application.xml", '--IceDir="%s" --TestDir="%s"' % (TestUtil.toplevel, os.getcwd()),
variables)