summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2020-12-10 17:02:27 +0100
committerJose <jose@zeroc.com>2020-12-10 17:02:27 +0100
commitbda65d3ebea958c09dee8a7eb14df0eb3e6d6cf7 (patch)
treede646a1995ca60a2b2c6d11a90ad23be68dc729a /scripts/Util.py
parentAdditional fixes for .NET test scripts (diff)
downloadice-bda65d3ebea958c09dee8a7eb14df0eb3e6d6cf7.tar.bz2
ice-bda65d3ebea958c09dee8a7eb14df0eb3e6d6cf7.tar.xz
ice-bda65d3ebea958c09dee8a7eb14df0eb3e6d6cf7.zip
.NET IceBox test script fixes
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 0d600562b35..2c931ed1d37 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -3549,8 +3549,8 @@ class CSharpMapping(Mapping):
else:
path = os.path.join(current.testcase.getPath(current), current.getBuildDir(exe))
- useDotnetExe = current.config.dotnetcore and \
- (current.config.testTargetFramework in ["netcoreapp2.1"] or process.isFromBinDir())
+ useDotnetExe = ((process.isFromBinDir() and current.config.testTargetFramework != "net45")
+ or current.config.testTargetFramework in ["netcoreapp2.1"])
command = ""
if useDotnetExe:
command += "dotnet "