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/Component.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/Component.py')
| -rw-r--r-- | scripts/Component.py | 8 |
1 files changed, 8 insertions, 0 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: |