diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2018-07-20 11:30:37 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2018-07-20 11:30:37 +0200 |
| commit | 3a622fc35f91815375cb20965e9a2f78ff3df7ed (patch) | |
| tree | dd4c5b8f700ed75ed58789ce54d4a307639ec07c /scripts/Component.py | |
| parent | Fixed tests to target netcoreapp2.1 to ensure latest 2.1 runtime is used (diff) | |
| download | ice-3a622fc35f91815375cb20965e9a2f78ff3df7ed.tar.bz2 ice-3a622fc35f91815375cb20965e9a2f78ff3df7ed.tar.xz ice-3a622fc35f91815375cb20965e9a2f78ff3df7ed.zip | |
Fixed test driver to use netcoreapp2.1 for tests
Diffstat (limited to 'scripts/Component.py')
| -rw-r--r-- | scripts/Component.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scripts/Component.py b/scripts/Component.py index 1e7be19c74b..2d677a91565 100644 --- a/scripts/Component.py +++ b/scripts/Component.py @@ -135,10 +135,9 @@ class Ice(Component): elif parent in ["Glacier2"] and testId not in ["Glacier2/application", "Glacier2/sessionHelper"]: return False - if isinstance(mapping, CSharpMapping) and current.config.netframework: - if isinstance(platform, Darwin): - if parent in ["IceSSL"]: - return False + # IceSSL test doesn't work on macOS/.NET Core + if isinstance(mapping, CSharpMapping) and isinstance(platform, Darwin) and parent in ["IceSSL"]: + return False return True |