diff options
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 67931169e5a..6c308aeb9b2 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1974,16 +1974,19 @@ class TestSuite(object): def isMainThreadOnly(self, driver): if self.runOnMainThread or driver.getComponent().isMainThreadOnly(self.id): return True - for m in [CppMapping, JavaMapping, CSharpMapping, PythonMapping, PhpMapping, RubyMapping, JavaScriptMixin, - SwiftMapping]: - if isinstance(self.mapping, m): - config = driver.configs[self.mapping] - if "iphone" in config.buildPlatform or config.uwp or config.browser or config.android: - return True # Not supported yet for tests that require a remote process controller - return False - else: + + if isinstance(self.mapping, MatlabMapping): return True + # Only Objective-C mapping cross test support workers. + if isinstance(self.mapping, ObjCMapping) and not driver.getComponent().isCross(self.id): + return True + + config = driver.configs[self.mapping] + if "iphone" in config.buildPlatform or config.uwp or config.browser or config.android: + return True # Not supported yet for tests that require a remote process controller + return False + def addTestCase(self, testcase): if testcase.name in self.testcases: raise RuntimeError("duplicate testcase {0} in testsuite {1}".format(testcase, self)) |