diff options
| author | Jose <jose@zeroc.com> | 2016-11-30 11:10:10 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-11-30 11:10:10 +0100 |
| commit | 61a7d9b651a89391339ae1aa7f88de8757bfe728 (patch) | |
| tree | fd806011f962e7dc40ef327a396cc0546d4238d5 /scripts/IceGridUtil.py | |
| parent | Use bzip2 from zeroc.ice.net Nuget package with binary dist testing (diff) | |
| download | ice-61a7d9b651a89391339ae1aa7f88de8757bfe728.tar.bz2 ice-61a7d9b651a89391339ae1aa7f88de8757bfe728.tar.xz ice-61a7d9b651a89391339ae1aa7f88de8757bfe728.zip | |
Fixes to run IceGrid test with Windows bindist in debug mode
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 95656d101b4..66ebd23a62d 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -220,10 +220,11 @@ class IceGridTestCase(TestCase): serverProps = Server().getProps(current) variables = { "test.dir" : self.getPath(), - "ice.bindir" : self.mapping.getBinDir(None, current), "java.exe" : os.path.join(javaHome, "bin", "java") if javaHome else "java", "icebox.exe" : IceBox().getCommandLine(current), "icegridnode.exe" : IceGridNode().getCommandLine(current), + "glacier2router.exe" : Glacier2Router().getCommandLine(current), + "icepatch2server.exe" : IcePatch2Server().getCommandLine(current), "icegridregistry.exe" : IceGridRegistryMaster().getCommandLine(current), "properties-override" : self.icegridnode[0].getPropertiesOverride(current) } |