diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 17:16:19 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-11-05 17:16:19 +0100 |
| commit | cc0c98cca7da54f67a69bb39e8768aef7d85f93d (patch) | |
| tree | a47dc8cd7352b20f8c89ced5d64dd9a6f5afa5f8 /scripts/Util.py | |
| parent | Fix static builds failures due to missing libsystemd (diff) | |
| download | ice-cc0c98cca7da54f67a69bb39e8768aef7d85f93d.tar.bz2 ice-cc0c98cca7da54f67a69bb39e8768aef7d85f93d.tar.xz ice-cc0c98cca7da54f67a69bb39e8768aef7d85f93d.zip | |
Fixed SSL testing with Xamarin
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 9d14f95ad6d..1d5f0a56eb8 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -2974,7 +2974,7 @@ class Driver: processController = UWPProcessController elif process and current.config.browser and isinstance(process.getMapping(current), JavaScriptMixin): processController = BrowserProcessController - elif process and current.config.android and isinstance(process.getMapping(current), JavaMapping): + elif process and current.config.android: processController = AndroidProcessController else: processController = LocalProcessController @@ -3302,6 +3302,7 @@ class CSharpMapping(Mapping): }) if current.config.xamarin: props["Ice.InitPlugins"] = 0 + props["IceSSL.CAs"] = "cacert.der"; return props def getPluginEntryPoint(self, plugin, process, current): |