Fixes to run IceGrid test with Windows bindist in debug mode

12 files changed, 30 insertions, 38 deletions

diff --git a/cpp/test/IceGrid/allocation/application.xml b/cpp/test/IceGrid/allocation/application.xml
index 81848fa7e78..27c8ad021f7 100644
--- a/cpp/test/IceGrid/allocation/application.xml
+++ b/cpp/test/IceGrid/allocation/application.xml
@@ -8,7 +8,7 @@
       <parameter name="verifier"/>
       <parameter name="manager"/>
 
-      <server id="${id}" exe="${ice.bindir}/glacier2router">
+      <server id="${id}" exe="${glacier2router.exe}">
         <property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
         <property name="Glacier2.Server.Endpoints" value="tcp"/>
         <property name="Glacier2.SessionManager" value="${manager}"/>
diff --git a/cpp/test/IceGrid/distribution/application.xml b/cpp/test/IceGrid/distribution/application.xml
index 57a932b279c..5061dfc6260 100644
--- a/cpp/test/IceGrid/distribution/application.xml
+++ b/cpp/test/IceGrid/distribution/application.xml
@@ -10,7 +10,7 @@
        <parameter name="directory"/>
 
        <server id="${instance-name}"
-               exe="${ice.bindir}/icepatch2server"
+               exe="${icepatch2server.exe}"
                application-distrib="false" activation="manual">
          <adapter name="IcePatch2" endpoints="${endpoints}">
            <object identity="${instance-name}/server" type="::IcePatch2::FileServer"/>
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
index 8f55db3e7b6..fd9dff8b957 100644
--- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
@@ -542,14 +542,9 @@ allTests(const Ice::CommunicatorPtr& communicator)
         adapter.objects.push_back(object);
         service->adapters.push_back(adapter);
 
-        string iceboxExe = "/icebox";
-#if defined(__linux) && defined(__i386)
-        iceboxExe += "32";
-#endif
-
         IceBoxDescriptorPtr icebox = new IceBoxDescriptor();
         icebox->id = "IceBox";
-        icebox->exe = properties->getProperty("IceBinDir") + iceboxExe;
+        icebox->exe = properties->getProperty("IceBoxExe");
         icebox->activation = "on-demand";
         icebox->applicationDistrib = false;
         icebox->allocatable = false;
diff --git a/cpp/test/IceGrid/noRestartUpdate/test.py b/cpp/test/IceGrid/noRestartUpdate/test.py
index 2bcb8e1be6d..e4b1fdbd0d8 100644
--- a/cpp/test/IceGrid/noRestartUpdate/test.py
+++ b/cpp/test/IceGrid/noRestartUpdate/test.py
@@ -16,7 +16,7 @@ class IceGridNoRestartUpdateTestCase(IceGridTestCase):
         self.mkdirs("db/node2")
 
 clientProps = lambda process, current: {
-    "IceBinDir" : current.testcase.getMapping().getBinDir(None, current),
+    "IceBoxExe" : IceBox().getCommandLine(current),
     "ServerDir" : current.getBuildDir("server"),
     "ServiceDir" : current.getBuildDir("testservice")
 }
diff --git a/cpp/test/IceGrid/session/AllTests.cpp b/cpp/test/IceGrid/session/AllTests.cpp
index dcf1d8414b8..fddfaf48756 100644
--- a/cpp/test/IceGrid/session/AllTests.cpp
+++ b/cpp/test/IceGrid/session/AllTests.cpp
@@ -1678,7 +1678,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 //      nodeApp.name = "NodeApp";
 //      ServerDescriptorPtr server = new ServerDescriptor();
 //      server->id = "node-1";
-//      server->exe = properties->getProperty("IceBinDir") + "/icegridnode";
+//      server->exe = properties->getProperty("IceGridNodeExe");
 //      server->options.push_back("--nowarn");
 //      server->pwd = ".";
 //      addProperty(server, "IceGrid.Node.Name", "node-1");
@@ -1803,7 +1803,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         nodeApp.name = "NodeApp";
         ServerDescriptorPtr server = new ServerDescriptor();
         server->id = "node-1";
-        server->exe = properties->getProperty("IceBinDir") + "/icegridnode";
+        server->exe = properties->getProperty("IceGridNodeExe");
         server->options.push_back("--nowarn");
         server->pwd = ".";
         server->applicationDistrib = false;
diff --git a/cpp/test/IceGrid/session/application.xml b/cpp/test/IceGrid/session/application.xml
index 921271e4eab..d47bb94e1c4 100644
--- a/cpp/test/IceGrid/session/application.xml
+++ b/cpp/test/IceGrid/session/application.xml
@@ -9,7 +9,7 @@
       <parameter name="manager"/>
       <parameter name="ssl-manager"/>
 
-      <server id="${id}" exe="${ice.bindir}/glacier2router">
+      <server id="${id}" exe="${glacier2router.exe}">
         <property name="Glacier2.Client.Endpoints" value="${endpoints}"/>
         <property name="Glacier2.Server.Endpoints" value="tcp -h 127.0.0.1"/>
 
diff --git a/cpp/test/IceGrid/session/test.py b/cpp/test/IceGrid/session/test.py
index 40dc66f84b5..e119aab24eb 100644
--- a/cpp/test/IceGrid/session/test.py
+++ b/cpp/test/IceGrid/session/test.py
@@ -38,13 +38,13 @@ registryProps = {
 }
 
 clientProps = lambda process, current: {
-    "IceBinDir" : current.testcase.getMapping().getBinDir(None, current),
+    "IceGridNodeExe" : IceGridNode().getCommandLine(current),
     "ServerDir" : current.getBuildDir("server"),
     "TestDir" : "{testdir}",
 }
 
 clientProps10 = lambda process, current: {
-    "IceBinDir" : current.testcase.getMapping().getBinDir(None, current),
+    "IceGridNodeExe" : IceGridNode().getCommandLine(current),
     "ServerDir" : current.getBuildDir("server"),
     "TestDir" : "{testdir}",
     "Ice.Default.EncodingVersion" : "1.0"
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index 67653d1252c..5559b8436f9 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -554,21 +554,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         IceBoxDescriptorPtr server = new IceBoxDescriptor();
         server->id = "IceBox";
-
-        string iceboxExe = "/icebox";
-#if defined(__linux)
-#  if defined(__i386)
-        iceboxExe += "32";
-#  endif
-#  if defined(ICE_CPP11_COMPILER)
-        iceboxExe += "++11";
-#  endif
-#endif
-
-#if defined(_WIN32) && !defined(NDEBUG)
-        iceboxExe += "d";
-#endif
-        server->exe = properties->getProperty("IceBinDir") + iceboxExe;
+        server->exe = properties->getProperty("IceBoxExe");
 
         server->applicationDistrib = false;
         server->allocatable = false;
@@ -1115,7 +1101,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         ServerDescriptorPtr server = new ServerDescriptor();
         server->id = "node-${index}";
-        server->exe = properties->getProperty("IceBinDir") + "/icegridnode";
+        server->exe = properties->getProperty("IceGridNodeExe");
         server->pwd = ".";
         server->applicationDistrib = false;
         server->allocatable = false;
diff --git a/cpp/test/IceGrid/update/test.py b/cpp/test/IceGrid/update/test.py
index 77847b4d202..8ac439aefaf 100644
--- a/cpp/test/IceGrid/update/test.py
+++ b/cpp/test/IceGrid/update/test.py
@@ -17,7 +17,8 @@ class IceGridUpdateTestCase(IceGridTestCase):
 
 clientProps = lambda process, current: {
     "NodePropertiesOverride" : current.testcase.icegridnode[0].getPropertiesOverride(current),
-    "IceBinDir" : current.testcase.getMapping().getBinDir(None, current),
+    "IceBoxExe" : IceBox().getCommandLine(current),
+    "IceGridNodeExe" : IceGridNode().getCommandLine(current),
     "ServerDir" : current.getBuildDir("server"),
     "TestDir" : "{testdir}"
 }
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)
             }
diff --git a/scripts/IcePatch2Util.py b/scripts/IcePatch2Util.py
index 1a7fda7ca83..8847e681a43 100644
--- a/scripts/IcePatch2Util.py
+++ b/scripts/IcePatch2Util.py
@@ -13,3 +13,13 @@ class IcePatch2Calc(ProcessFromBinDir, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2calc", mapping=Mapping.getByName("cpp"), *args, **kargs)
+
+class IcePatch2Client(ProcessFromBinDir, Process):
+
+    def __init__(self, *args, **kargs):
+        Process.__init__(self, exe="icepatch2client", mapping=Mapping.getByName("cpp"), *args, **kargs)
+
+class IcePatch2Server(ProcessFromBinDir, Process):
+
+    def __init__(self, *args, **kargs):
+        Process.__init__(self, exe="icepatch2server", mapping=Mapping.getByName("cpp"), *args, **kargs)
diff --git a/scripts/Util.py b/scripts/Util.py
index e6244a33812..864564903e6 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -230,10 +230,8 @@ class Windows(Platform):
                                                                                         getIceJSONVersion()))
         assert False
 
-
     def getBinSubDir(self, mapping, process, current):
         c = current.config
-
         if current.driver.useBinDist():
             if isinstance(process, SliceTranslator):
                 return os.path.join(self.getNugetPackage(mapping), "build", "native", "bin", "Win32", "Release")
@@ -245,10 +243,11 @@ class Windows(Platform):
             #
 
             #
-            # With Windows binary distribution glacier2router binaries are only include for 
-            # Release configuration.
+            # With Windows binary distribution Glacier2 and IcePatch binaries are only included
+            # for Release configuration.
             #
-            if isinstance(process, Glacier2Router):
+            if (isinstance(process, Glacier2Router) or isinstance(process, IcePatch2Calc) or
+                isinstance(process, IcePatch2Client) or isinstance(process, IcePatch2Server)):
                 config = "Release"
             else:
                 config = "Debug" if c.buildConfig.find("Debug") >= 0 else "Release"
@@ -2104,9 +2103,9 @@ class JavaScriptMapping(Mapping):
 
 from Glacier2Util import *
 from IceBoxUtil import *
+from IcePatch2Util import *
 from IceGridUtil import *
 from IceStormUtil import *
-from IcePatch2Util import *
 from LocalDriver import *
 
 #