diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-04-19 12:54:53 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-04-19 12:54:53 +0200 |
| commit | faf66d7d89b4d191fedb6940897e7db7618f40f4 (patch) | |
| tree | 80f8d5293800bd429861439e259b6fe376eb7db6 /scripts/Util.py | |
| parent | Missing throws clause in test Controller.ice (diff) | |
| download | ice-faf66d7d89b4d191fedb6940897e7db7618f40f4.tar.bz2 ice-faf66d7d89b4d191fedb6940897e7db7618f40f4.tar.xz ice-faf66d7d89b4d191fedb6940897e7db7618f40f4.zip | |
Fixed Util.py bug and ensure UDP tests uses loopback on Windows
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index f43b1f7530a..21a0a7f9887 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1904,19 +1904,19 @@ class iOSSimulatorProcessController(RemoteProcessController): device = "iOSSimulatorProcessController" deviceID = "com.apple.CoreSimulator.SimDeviceType.iPhone-6" - # Pick the last iOS simulator runtime ID in the list of iOS simulators (assumed to be the latest). - runtimeID = None - for r in run("xcrun simctl list runtimes").split('\n'): - m = re.search("iOS .* \(.*\) \((.*)\)", r) - if m: - runtimeID = m.group(1) - if not runtimeID: - runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-10-3" # Default value appPath = "ios/controller/build" def __init__(self, current): RemoteProcessController.__init__(self, current) self.simulatorID = None + self.runtimeID = None + # Pick the last iOS simulator runtime ID in the list of iOS simulators (assumed to be the latest). + for r in run("xcrun simctl list runtimes").split('\n'): + m = re.search("iOS .* \(.*\) \((.*)\)", r) + if m: + self.runtimeID = m.group(1) + if not self.runtimeID: + self.runtimeID = "com.apple.CoreSimulator.SimRuntime.iOS-10-3" # Default value def __str__(self): return "iOS Simulator" |