diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-12-18 09:17:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-12-18 09:17:20 +0100 |
| commit | 7b5cbac03c92f58decf024b37480c559c5bd2187 (patch) | |
| tree | b84e56040fb67289642e53a1f9c5eb1cdc24c3c4 /scripts/Util.py | |
| parent | Use Promise.prototype.try native implementation (diff) | |
| download | ice-7b5cbac03c92f58decf024b37480c559c5bd2187.tar.bz2 ice-7b5cbac03c92f58decf024b37480c559c5bd2187.tar.xz ice-7b5cbac03c92f58decf024b37480c559c5bd2187.zip | |
Check for bin/<arch> directory when running tests, fixes #125
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 8873bb821ec..85a40847075 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -329,9 +329,10 @@ class Linux(Platform): if isinstance(mapping, CSharpMapping): return Platform._getBinDir(self, component, process, mapping, current) - buildPlatform = current.driver.configs[mapping].buildPlatform - if self.linuxId in ["ubuntu", "debian"] and buildPlatform in self.foreignPlatforms: - return os.path.join(installDir, "bin", self.multiArch[buildPlatform]) + if self.linuxId in ["ubuntu", "debian"]: + binDir = os.path.join(installDir, "bin", self.multiArch[current.driver.configs[mapping].buildPlatform]) + if os.path.exists(binDir): + return binDir return os.path.join(installDir, "bin") def _getLibDir(self, component, process, mapping, current): |