test: fix test runner arg regression

stefanmb · mhdawson · commit c98d159ed34a · 2016-02-26T12:43:03.000-05:00
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>
diff --git 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()
