diff options
| author | Jose <jose@zeroc.com> | 2017-12-26 22:36:31 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-12-26 22:36:31 +0100 |
| commit | fa25b5dfeb797e9d711ee310a5bab09549d749fd (patch) | |
| tree | fdfeb7ffd9cd106b86e79d71f2d5c8255aaac616 /scripts/Util.py | |
| parent | Fix for C# dispatcher test (diff) | |
| download | ice-fa25b5dfeb797e9d711ee310a5bab09549d749fd.tar.bz2 ice-fa25b5dfeb797e9d711ee310a5bab09549d749fd.tar.xz ice-fa25b5dfeb797e9d711ee310a5bab09549d749fd.zip | |
Disable test workers with .NET Corev3.7.1-netcore-beta0
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 089044c54b1..1a2e7f96d0b 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1813,8 +1813,10 @@ class TestSuite: def isMainThreadOnly(self, driver): for m in [CppMapping, JavaMapping, CSharpMapping]: - if isinstance(self.mapping, m): - config = driver.configs[self.mapping] + config = driver.configs[self.mapping] + if isinstance(self.mapping, CSharpMapping) and config.netframework: + return True + elif isinstance(self.mapping, m): if "iphone" in config.buildPlatform or config.uwp: return True # Not supported yet for tests that require a remote process controller return self.runOnMainThread |