Skip to content

Commit

Permalink
test: fix test runner arg regression
Browse files Browse the repository at this point in the history
Append --node-args to existing list, don't overwrite arg list.

Fixes: #5442
PR-URL: #5446
Reviewed-By: Ben Noorhduis <info@bnoordhuis.nl>
Reviewed-by: Michael Dawson <michael_dawson@ca.ibm.com>
  • Loading branch information
stefanmb authored and rvagg committed Feb 27, 2016
1 parent 8c67b94 commit 22bb7c9
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tools/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -709,7 +709,10 @@ def GetConfiguration(self, context):
(file, pathname, description) = imp.find_module('testcfg', [ self.path ])
module = imp.load_module('testcfg', file, pathname, description)
self.config = module.GetConfiguration(context, self.path)
self.config.additional_flags = context.node_args
if hasattr(self.config, 'additional_flags'):
self.config.additional_flags += context.node_args
else:
self.config.additional_flags = context.node_args
finally:
if file:
file.close()
Expand Down

0 comments on commit 22bb7c9

Please sign in to comment.