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/IceGridUtil.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/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 1829fad1c91..698519c45e4 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -252,8 +252,8 @@ class IceGridTestCase(TestCase): varStr = " ".join(["{0}={1}".format(k, val(v, True)) for k,v in variables.items()]) targets = " ".join(self.targets) application = self.application - if current.config.netframework == "netcoreapp2.0": - application = application.replace(".xml", ".{0}.xml".format("netcoreapp2.0")) + if isinstance(self.mapping, CSharpMapping) and current.config.dotnetcore: + application = application.replace(".xml", ".netcoreapp.xml") self.runadmin(current, "application add -n {0} {1} {2}".format(application, varStr, targets)) def teardownClientSide(self, current, success): |