diff options
| author | Bernard Normier <bernard@zeroc.com> | 2019-08-02 15:07:36 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2019-08-02 15:07:36 -0500 |
| commit | 9e224d63e1afda849767492c30737a44ff971980 (patch) | |
| tree | 3d3444cc55a994b685c6356caafd6e2a107ab14b /scripts/IceBoxUtil.py | |
| parent | C++/Swift Ice/exception cross testing failure - Close #468 (diff) | |
| download | ice-9e224d63e1afda849767492c30737a44ff971980.tar.bz2 ice-9e224d63e1afda849767492c30737a44ff971980.tar.xz ice-9e224d63e1afda849767492c30737a44ff971980.zip | |
Fixed ppc testing with bin
Diffstat (limited to 'scripts/IceBoxUtil.py')
| -rw-r--r-- | scripts/IceBoxUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
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" |