From 479a43c876f0e2d04b7d119a03a565c642bf93c6 Mon Sep 17 00:00:00 2001 From: Stefan Budeanu Date: Mon, 22 Feb 2016 21:55:35 -0500 Subject: [PATCH] test: allow passing args to executable Add --node-args option that will pass arguments. PR-URL: https://github.com/nodejs/node/pull/5376 Reviewed-By: Ben Noordhuis Reviewed-By: Rich Trott Reviewed-By: Michael Dawson --- test/parallel/test-cluster-debug-port.js | 1 - tools/test.py | 8 +++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/test/parallel/test-cluster-debug-port.js b/test/parallel/test-cluster-debug-port.js index 076a59108b..e8f3f58b95 100644 --- a/test/parallel/test-cluster-debug-port.js +++ b/test/parallel/test-cluster-debug-port.js @@ -4,7 +4,6 @@ const assert = require('assert'); const cluster = require('cluster'); if (cluster.isMaster) { - assert.strictEqual(process.execArgv.length, 0, 'run test with no args'); function checkExitCode(code, signal) { assert.strictEqual(code, 0); diff --git a/tools/test.py b/tools/test.py index 217e72b870..a1401589c9 100755 --- a/tools/test.py +++ b/tools/test.py @@ -709,6 +709,7 @@ 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 finally: if file: file.close() @@ -774,11 +775,13 @@ TIMEOUT_SCALEFACTOR = { class Context(object): - def __init__(self, workspace, buildspace, verbose, vm, timeout, processor, suppress_dialogs, store_unexpected_output): + def __init__(self, workspace, buildspace, verbose, vm, args, timeout, + processor, suppress_dialogs, store_unexpected_output): self.workspace = workspace self.buildspace = buildspace self.verbose = verbose self.vm_root = vm + self.node_args = args self.timeout = timeout self.processor = processor self.suppress_dialogs = suppress_dialogs @@ -1281,6 +1284,8 @@ def BuildOptions(): result.add_option("--snapshot", help="Run the tests with snapshot turned on", default=False, action="store_true") result.add_option("--special-command", default=None) + result.add_option("--node-args", dest="node_args", help="Args to pass through to Node", + default=[], action="append") result.add_option("--valgrind", help="Run tests through valgrind", default=False, action="store_true") result.add_option("--cat", help="Print the source of the tests", @@ -1471,6 +1476,7 @@ def Main(): buildspace, VERBOSE, shell, + options.node_args, options.timeout, processor, options.suppress_dialogs,