diff options
author | Stefan Budeanu <stefan@budeanu.com> | 2016-02-26 00:30:16 -0500 |
---|---|---|
committer | Michael Dawson <michael_dawson@ca.ibm.com> | 2016-02-26 12:43:03 -0500 |
commit | c98d159ed34a3ec5fdadaf676d8ec49356ab741f (patch) | |
tree | c09ea78a90ac6a77d6871ec6486350c6e43e7ed2 /tools | |
parent | 88728408e0cf38f49889001309da661d3c7c1b6b (diff) | |
download | android-node-v8-c98d159ed34a3ec5fdadaf676d8ec49356ab741f.tar.gz android-node-v8-c98d159ed34a3ec5fdadaf676d8ec49356ab741f.tar.bz2 android-node-v8-c98d159ed34a3ec5fdadaf676d8ec49356ab741f.zip |
test: fix test runner arg regression
Append --node-args to existing list, don't overwrite arg list.
Fixes: https://github.com/nodejs/node/issues/5442
PR-URL: https://github.com/nodejs/node/pull/5446
Reviewed-By: Ben Noorhduis <info@bnoordhuis.nl>
Reviewed-by: Michael Dawson <michael_dawson@ca.ibm.com>
Diffstat (limited to 'tools')
-rwxr-xr-x | tools/test.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/test.py b/tools/test.py index a1401589c9..9d227b10ae 100755 --- a/tools/test.py +++ b/tools/test.py @@ -709,7 +709,10 @@ class TestRepository(TestSuite): (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() |