diff options
| author | Jose <jose@zeroc.com> | 2018-02-09 10:27:41 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2018-02-09 10:28:32 +0100 |
| commit | 06ff152b0f47ac824edc2d33fa2c6a64a0adb724 (patch) | |
| tree | 60d46838e4716c011f5f1f13331204ca38c77127 /scripts/IceGridUtil.py | |
| parent | Fixing MATLAB source line endings (diff) | |
| download | ice-06ff152b0f47ac824edc2d33fa2c6a64a0adb724.tar.bz2 ice-06ff152b0f47ac824edc2d33fa2c6a64a0adb724.tar.xz ice-06ff152b0f47ac824edc2d33fa2c6a64a0adb724.zip | |
IceGrid tests fails to run on Windows if .NET Core is not installed
Closes ICE-8657
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index 02e72c8fce7..036164c4158 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -228,7 +228,6 @@ class IceGridTestCase(TestCase): variables = { "test.dir" : self.getPath(), "java.exe" : os.path.join(javaHome, "bin", "java") if javaHome else "java", - "dotnet.exe" : platform.getDotnetExe(), "icebox.exe" : IceBox().getCommandLine(current), "icegridnode.exe" : IceGridNode().getCommandLine(current), "glacier2router.exe" : Glacier2Router().getCommandLine(current), @@ -237,6 +236,9 @@ class IceGridTestCase(TestCase): "properties-override" : self.icegridnode[0].getPropertiesOverride(current), } + if platform.getDotnetExe(): + variables["dotnet.exe"] = platform.getDotnetExe() + # Add variables that point to the directories containing the built executables for (k, v) in self.exevars.items(): variables[k] = current.getBuildDir(v) |