summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-09-04 08:26:48 +0200
committerBenoit Foucher <benoit@zeroc.com>2019-09-04 08:32:52 +0200
commit73298029c484ee4f702ad350701f176b1acacec1 (patch)
tree441465b76d8abccdca07fae7d789322e7eceecb7 /scripts/Util.py
parentFixed Swift collocated tests to not activate the adapter (diff)
downloadice-73298029c484ee4f702ad350701f176b1acacec1.tar.bz2
ice-73298029c484ee4f702ad350701f176b1acacec1.tar.xz
ice-73298029c484ee4f702ad350701f176b1acacec1.zip
Fixed Swift testing to check for OPTIMIZE to run either Debug/Release driver
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py8
1 files changed, 8 insertions, 0 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index f22286ea219..4b34f9e9c5a 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -3872,9 +3872,17 @@ class TypeScriptMapping(JavaScriptMixin,Mapping):
class SwiftMapping(Mapping):
class Config(CppBasedClientMapping.Config):
+
mappingName = "swift"
mappingDesc = "Swift"
+ def __init__(self, options=[]):
+ CppBasedClientMapping.Config.__init__(self, options)
+ if self.buildConfig == platform.getDefaultBuildConfig():
+ # Check the OPTIMIZE environment variable to figure out if it's Debug/Release build
+ self.buildConfig = "Release" if os.environ.get("OPTIMIZE", "yes") != "no" else "Debug"
+
+
def getCommandLine(self, current, process, exe, args):
testdir = self.component.getTestDir(self)
assert(current.testcase.getPath(current).startswith(testdir))