summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-06-16 17:56:16 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-06-16 17:56:16 +0200
commit2b12f731cfa1750c624527341be60b573603fce3 (patch)
treeb9f117a637807bdefe0aa9ed329e6108695dbd2b /scripts/Util.py
parentPotential fix for ICE-8076 and ICE-8077 - use a domain ID for IceDiscovery/si... (diff)
downloadice-2b12f731cfa1750c624527341be60b573603fce3.tar.bz2
ice-2b12f731cfa1750c624527341be60b573603fce3.tar.xz
ice-2b12f731cfa1750c624527341be60b573603fce3.zip
Fixed iOS/UWP testing to ignore --workers, it's not supported yet
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index e1cc615e5a4..1736610875a 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -1640,9 +1640,12 @@ class TestSuite:
def getLibDirs(self):
return self.libDirs
- def isMainThreadOnly(self):
+ def isMainThreadOnly(self, driver):
for m in [CppMapping, JavaMapping, CSharpMapping]:
if isinstance(self.mapping, m):
+ config = driver.configs[self.mapping]
+ if "iphone" in config.buildPlatform or config.uwp:
+ return True # Not supported yet for tests that require a remote process controller
return self.runOnMainThread
else:
return True