Fixed ppc testing with bin

4 files changed, 13 insertions, 5 deletions

diff --git a/scripts/Component.py b/scripts/Component.py
index 74ed503e8cb..5e0d4cbc0fb 100644
--- a/scripts/Component.py
+++ b/scripts/Component.py
@@ -128,6 +128,14 @@ class Ice(Component):
             if self.useBinDist(mapping, current):
                 if parent in ["Glacier2", "IceBridge"] and current.config.buildConfig.find("Debug") >= 0:
                     return False
+        elif isinstance(platform, AIX):
+            if current.config.buildPlatform == "ppc" and self.useBinDist(mapping, current):
+                #
+                # Don't test Glacier2/IceGrid services on ppc with bindist. We only ship
+                # ppc64 binaries for Glacier2 and IceGrid
+                #
+                if parent in ["Glacier2", "IceGrid"]:
+                    return False
 
         # No C++11 tests for IceStorm, IceGrid, etc
         if isinstance(mapping, CppMapping) and current.config.cpp11:
diff --git a/scripts/IceBoxUtil.py b/scripts/IceBoxUtil.py
index b9c598bc5c9..91c5d18ac7d 100644
--- a/scripts/IceBoxUtil.py
+++ b/scripts/IceBoxUtil.py
@@ -4,6 +4,7 @@
 
 import sys, os
 from Util import *
+from Component import component
 
 class IceBox(ProcessFromBinDir, Server):
 
@@ -79,7 +80,7 @@ class IceBoxAdmin(ProcessFromBinDir, ProcessIsReleaseOnly, Client):
         elif isinstance(mapping, JavaMapping):
             return "com.zeroc.IceBox.Admin"
         elif isinstance(platform, AIX) and \
-             current.config.buildPlatform == "ppc":
+             current.config.buildPlatform == "ppc" and not component.useBinDist(mapping, current):
             return "iceboxadmin_32"
         else:
             return "iceboxadmin"
diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py
index 66750151e1b..7d397259858 100644
--- a/scripts/IceStormUtil.py
+++ b/scripts/IceStormUtil.py
@@ -22,6 +22,9 @@ class IceStorm(ProcessFromBinDir, Server):
         self.desc = self.instanceName if self.nreplicas == 0 else "{0} replica #{1}".format(self.instanceName,
                                                                                             self.replica)
 
+    def getExe(self, current):
+        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
+
     def setup(self, current):
         # Create the database directory
         if self.createDb:
diff --git a/scripts/Util.py b/scripts/Util.py
index 2ec519657d9..fe79b115b81 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -1404,9 +1404,6 @@ class ProcessFromBinDir:
     def isFromBinDir(self):
         return True
 
-    def getExe(self, current):
-        return self.exe + "_32" if current.config.buildPlatform == "ppc" else self.exe
-
 #
 # Executables for processes inheriting this marker class are only provided
 # as a Release executble on Windows
@@ -1416,7 +1413,6 @@ class ProcessIsReleaseOnly:
     def isReleaseOnly(self):
         return True
 
-
 class SliceTranslator(ProcessFromBinDir, ProcessIsReleaseOnly, SimpleClient):
 
     def __init__(self, translator):