From 22bb7c9d27fe495f3d346967a45dc3d226ff7056 Mon Sep 17 00:00:00 2001 From: Stefan Budeanu Date: Fri, 26 Feb 2016 00:30:16 -0500 Subject: [PATCH] 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 Reviewed-by: Michael Dawson --- tools/test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/test.py b/tools/test.py index a1401589c9bf14..9d227b10aec35d 100755 --- a/tools/test.py +++ b/tools/test.py @@ -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()