summaryrefslogtreecommitdiff
path: root/scripts/IceGridUtil.py
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2019-08-02 18:28:26 -0500
committerBernard Normier <bernard@zeroc.com>2019-08-02 18:28:26 -0500
commit7af30e0c843ac1936b50a9318ae72d7375d7996b (patch)
tree1fb362ee6c5b49341300d4083667ce869d904819 /scripts/IceGridUtil.py
parentFixed ppc testing with bin (diff)
downloadice-7af30e0c843ac1936b50a9318ae72d7375d7996b.tar.bz2
ice-7af30e0c843ac1936b50a9318ae72d7375d7996b.tar.xz
ice-7af30e0c843ac1936b50a9318ae72d7375d7996b.zip
Fixes for source build testing on ppc
Diffstat (limited to 'scripts/IceGridUtil.py')
-rw-r--r--scripts/IceGridUtil.py9
1 files changed, 9 insertions, 0 deletions
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))