summaryrefslogtreecommitdiff
path: root/scripts/Util.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2019-02-13 11:54:37 +0100
committerBenoit Foucher <benoit@zeroc.com>2019-02-13 11:54:37 +0100
commiteb0136e3d18d20a09c16186a2a12146af5ffc8f0 (patch)
treed6cbb4ccc8a01cc90863760d64807f7f77133492 /scripts/Util.py
parentAdded support for overriding default config for testing (diff)
downloadice-eb0136e3d18d20a09c16186a2a12146af5ffc8f0.tar.bz2
ice-eb0136e3d18d20a09c16186a2a12146af5ffc8f0.tar.xz
ice-eb0136e3d18d20a09c16186a2a12146af5ffc8f0.zip
Removed bogus filtering from testing driver
Diffstat (limited to 'scripts/Util.py')
-rw-r--r--scripts/Util.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py
index f8df189c655..b98810e8bcc 100644
--- a/scripts/Util.py
+++ b/scripts/Util.py
@@ -662,7 +662,6 @@ class Mapping(object):
options.update(current.testcase.getMapping().getOptions(current))
options.update(current.testcase.getTestSuite().getOptions(current))
options.update(current.testcase.getOptions(current))
- options = current.driver.filterOptions(current.driver.getComponent().getOptions(current.testcase, current))
for (k, v) in options.items():
if hasattr(self, k):
@@ -682,7 +681,7 @@ class Mapping(object):
options.update(current.testcase.getMapping().getOptions(current))
options.update(current.testcase.getTestSuite().getOptions(current))
options.update(current.testcase.getOptions(current))
- options = current.driver.filterOptions(current.driver.getComponent().getOptions(current.testcase, current))
+
clone = copy.copy(self)
for o in self.parsedOptions:
if o in options and getattr(self, o) not in options[o]: