diff options
| author | Jose <jose@zeroc.com> | 2019-07-23 18:52:45 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-23 18:52:45 +0200 |
| commit | c461176eecd85517353f717f5dc896220eadc9ff (patch) | |
| tree | db18e417bbbb57ab320ca3e3605a10b9be565b86 /scripts/Util.py | |
| parent | Improved swift/Makefile (diff) | |
| download | ice-c461176eecd85517353f717f5dc896220eadc9ff.tar.bz2 ice-c461176eecd85517353f717f5dc896220eadc9ff.tar.xz ice-c461176eecd85517353f717f5dc896220eadc9ff.zip | |
Allow to test Swift with the binary distribution
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 2cbb3f49e61..13cc69ebac5 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -3895,7 +3895,9 @@ class SwiftMapping(Mapping): -target 'TestDriver iOS' \ -configuration {1} \ -showBuildSettings \ - -sdk {2}".format(self.getXcodeProject(current), current.config.buildConfig, current.config.buildPlatform) + -sdk {2}".format(self.getXcodeProject(current), + current.config.buildConfig, + current.config.buildPlatform) targetBuildDir = re.search("\sTARGET_BUILD_DIR = (.*)", run(cmd)).groups(1)[0] return "{0}/TestDriver.app".format(targetBuildDir) @@ -3909,7 +3911,8 @@ class SwiftMapping(Mapping): return Mapping.getByName("cpp").getPluginEntryPoint(plugin, process, current) def getXcodeProject(self, current): - return "{0}/ice.xcodeproj".format(current.testcase.getMapping().getPath()) + return "{0}/{1}".format(current.testcase.getMapping().getPath(), + "ice-test.xcodeproj" if self.component.useBinDist(self, current) else "ice.xcodeproj") # # Instantiate platform global variable |