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