summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2016-12-13 18:08:48 +0100
committerJose <jose@zeroc.com>2016-12-13 18:08:48 +0100
commitba160244669c4639de1a3a4a7b69753a3defee70 (patch)
tree9a214b5fff20318bd9ec0baf2e418f4cb90a3f34 /scripts/Util.py
parentScript fixes for Windows MSI distribution (diff)
downloadice-ba160244669c4639de1a3a4a7b69753a3defee70.tar.bz2
ice-ba160244669c4639de1a3a4a7b69753a3defee70.tar.xz
ice-ba160244669c4639de1a3a4a7b69753a3defee70.zip
Mising argument in getIceDir call
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 34b175d4cb0..3f32e54167a 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -1625,7 +1625,7 @@ class LocalProcessController(ProcessController):
"testcase": current.testcase,
"testdir": current.testcase.getPath(),
"builddir": current.getBuildDir(process.getExe(current)),
- "icedir" : current.driver.getIceDir(current.testcase.getMapping()),
+ "icedir" : current.driver.getIceDir(current.testcase.getMapping(), current),
}
args = ["--{0}={1}".format(k, val(v)) for k,v in props.items()] + [val(a) for a in args]
@@ -1929,7 +1929,7 @@ class Driver:
return toplevel
def getSliceDir(self, mapping, current):
- return platform.getSliceDir(self.getIceDir(mapping) if self.useBinDist() else toplevel)
+ return platform.getSliceDir(self.getIceDir(mapping, current) if self.useBinDist() else toplevel)
def isWorkerThread(self):
return False