diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-24 10:38:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-24 10:38:37 +0200 |
| commit | 1b7bf23345dcf21fb68363b3c75e6c0f5b28b590 (patch) | |
| tree | 37b897167d61a3c10c7b899bfdd0e4165ee91ac8 /scripts/Util.py | |
| parent | AMI cross test failure (diff) | |
| download | ice-1b7bf23345dcf21fb68363b3c75e6c0f5b28b590.tar.bz2 ice-1b7bf23345dcf21fb68363b3c75e6c0f5b28b590.tar.xz ice-1b7bf23345dcf21fb68363b3c75e6c0f5b28b590.zip | |
Minor Android fixes
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index a11d6b663cb..f3117226e04 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2075,12 +2075,13 @@ class iOSSimulatorProcessController(RemoteProcessController): return "iPhoneSimulator/com.zeroc.ObjC-ARC-Test-Controller" else: return "iPhoneSimulator/com.zeroc.ObjC-Test-Controller" - else: - assert(isinstance(current.testcase.getMapping(), CppMapping)) + elif isinstance(current.testcase.getMapping(), CppMapping): if current.config.cpp11: return "iPhoneSimulator/com.zeroc.Cpp11-Test-Controller" else: return "iPhoneSimulator/com.zeroc.Cpp98-Test-Controller" + else: + raise RuntimeError("can't run tests from the `{0}' mapping on iOS".format(current.testcase.getMapping())) def startControllerApp(self, current, ident): mapping = current.testcase.getMapping() |