summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-02-05 14:19:27 +0100
committerBenoit Foucher <benoit@zeroc.com>2019-02-05 14:19:27 +0100
commit8eb4fc613fe8f2e9eb1af43e606819fc1e29dd1c (patch)
treeb86c97aa349d92d9a03eba7b8ec9e3298ab1715f /scripts/Util.py
parentWindows support for transport without file descriptor (diff)
downloadice-8eb4fc613fe8f2e9eb1af43e606819fc1e29dd1c.tar.bz2
ice-8eb4fc613fe8f2e9eb1af43e606819fc1e29dd1c.tar.xz
ice-8eb4fc613fe8f2e9eb1af43e606819fc1e29dd1c.zip
Allow components to set properties for testing
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index 4e821a69bfb..a947e4e6b0f 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -159,6 +159,9 @@ class Component(object):
def getEnv(self, process, current):
return {}
+ def getProps(self, process, current):
+ return {}
+
def isCross(self, testId):
return False
@@ -1162,6 +1165,7 @@ class Process(Runnable):
def getEffectiveProps(self, current, props):
allProps = {}
allProps.update(current.driver.getProps(self, current))
+ allProps.update(current.driver.getComponent().getProps(self, current))
allProps.update(current.config.getProps(self, current))
allProps.update(self.getMapping(current).getProps(self, current))
allProps.update(current.testcase.getProps(self, current))