diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-06-16 16:41:59 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-06-16 16:41:59 +0200 |
| commit | 8951f6c7df22ac215d159e1917932d99da007a61 (patch) | |
| tree | fe6185d585f5b17ced287369d184ae1e1fcd2429 /scripts/Util.py | |
| parent | Fixed Ice/info test failure occuring when running on remote host (diff) | |
| download | ice-8951f6c7df22ac215d159e1917932d99da007a61.tar.bz2 ice-8951f6c7df22ac215d159e1917932d99da007a61.tar.xz ice-8951f6c7df22ac215d159e1917932d99da007a61.zip | |
Fixed bug to find ARC controller when running iPhoneOS
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 c2d35a6cb9e..e1cc615e5a4 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -323,7 +323,7 @@ class Windows(Platform): if isinstance(mapping, CppMapping): return os.path.join("bin", platform, config) elif isinstance(mapping, PhpMapping): - return os.path.join("msbuild", "packages", "zeroc.ice.v140.{0}".format(self.getNugetPackageVersion()), + return os.path.join("msbuild", "packages", "zeroc.ice.v140.{0}".format(self.getNugetPackageVersion()), "build", "native", "bin", platform, config) return "bin" @@ -2150,7 +2150,10 @@ class iOSDeviceProcessController(RemoteProcessController): def getControllerIdentity(self, current): if isinstance(current.testcase.getMapping(), ObjCMapping): - return "iPhoneOS/com.zeroc.ObjC-Test-Controller" + if current.config.arc: + return "iPhoneOS/com.zeroc.ObjC-ARC-Test-Controller" + else: + return "iPhoneOS/com.zeroc.ObjC-Test-Controller" else: assert(isinstance(current.testcase.getMapping(), CppMapping)) if current.config.cpp11: |