Fixes for source build testing on ppc

5 files changed, 30 insertions, 0 deletions

diff --git a/scripts/Glacier2Util.py b/scripts/Glacier2Util.py
index 9ef1635367c..842ed63555c 100644
--- a/scripts/Glacier2Util.py
+++ b/scripts/Glacier2Util.py
@@ -13,6 +13,9 @@ class Glacier2Router(ProcessFromBinDir, ProcessIsReleaseOnly, Server):
         self.portnum = portnum
         self.passwords = passwords
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def setup(self, current):
         if self.passwords:
             path = os.path.join(current.testsuite.getPath(), "passwords")
diff --git a/scripts/IceBridgeUtil.py b/scripts/IceBridgeUtil.py
index e6194524896..f635036f968 100644
--- a/scripts/IceBridgeUtil.py
+++ b/scripts/IceBridgeUtil.py
@@ -9,6 +9,9 @@ class IceBridge(ProcessFromBinDir, ProcessIsReleaseOnly, Server):
     def __init__(self, *args, **kargs):
         Server.__init__(self, "icebridge", mapping=Mapping.getByName("cpp"), desc="IceBridge", *args, **kargs)
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def getProps(self, current):
         props = Server.getProps(self, current);
         props.update({
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index 399596001a7..29306f361bd 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -51,6 +51,9 @@ class IceGridAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceGridClient):
         self.username = username
         self.password = password
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def getProps(self, current):
         props = IceGridClient.getProps(self, current)
         props["IceGridAdmin.Username"] = self.username
@@ -65,6 +68,9 @@ class IceGridNode(ProcessFromBinDir, Server):
                         ready="node", *args, **kargs)
         self.name = name
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def setup(self, current):
         # Create the database directory
         self.dbdir = os.path.join(current.testsuite.getPath(), "node-{0}".format(self.name))
@@ -121,6 +127,9 @@ class IceGridRegistry(ProcessFromBinDir, Server):
         self.readyCount = -1
         self.name = name
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def setup(self, current):
         # Create the database directory
         self.dbdir = os.path.join(current.testsuite.getPath(), "registry-{0}".format(self.name))
diff --git a/scripts/IcePatch2Util.py b/scripts/IcePatch2Util.py
index 5485d7babee..6b12ecccc76 100644
--- a/scripts/IcePatch2Util.py
+++ b/scripts/IcePatch2Util.py
@@ -9,12 +9,21 @@ class IcePatch2Calc(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2calc", mapping=Mapping.getByName("cpp"), *args, **kargs)
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
 class IcePatch2Client(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2client", mapping=Mapping.getByName("cpp"), *args, **kargs)
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
 class IcePatch2Server(ProcessFromBinDir, ProcessIsReleaseOnly, Process):
 
     def __init__(self, *args, **kargs):
         Process.__init__(self, exe="icepatch2server", mapping=Mapping.getByName("cpp"), *args, **kargs)
+
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py
index 7d397259858..f091de1c359 100644
--- a/scripts/IceStormUtil.py
+++ b/scripts/IceStormUtil.py
@@ -152,6 +152,12 @@ class IceStormAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, IceStormProcess, Cl
         Client.__init__(self, exe="icestormadmin", mapping=Mapping.getByName("cpp"), *args, **kargs)
         IceStormProcess.__init__(self, instanceName, instance)
 
+    def getExe(self, current):
+        if current.config.buildPlatform == "ppc" and not component.useBinDist(self.mapping, current):
+            return self.exe + "_32"
+        else:
+            return self.exe
+
     getParentProps = Client.getProps # Used by IceStormProcess to get the client properties
 
 class Subscriber(IceStormProcess, Server):