Browse Source

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 <info@bnoordhuis.nl>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
v5.x
Stefan Budeanu 9 years ago
committed by Rod Vagg
parent
commit
479a43c876
  1. 1
      test/parallel/test-cluster-debug-port.js
  2. 8
      tools/test.py

1
test/parallel/test-cluster-debug-port.js

@ -4,7 +4,6 @@ const assert = require('assert');
const cluster = require('cluster'); const cluster = require('cluster');
if (cluster.isMaster) { if (cluster.isMaster) {
assert.strictEqual(process.execArgv.length, 0, 'run test with no args');
function checkExitCode(code, signal) { function checkExitCode(code, signal) {
assert.strictEqual(code, 0); assert.strictEqual(code, 0);

8
tools/test.py

@ -709,6 +709,7 @@ class TestRepository(TestSuite):
(file, pathname, description) = imp.find_module('testcfg', [ self.path ]) (file, pathname, description) = imp.find_module('testcfg', [ self.path ])
module = imp.load_module('testcfg', file, pathname, description) module = imp.load_module('testcfg', file, pathname, description)
self.config = module.GetConfiguration(context, self.path) self.config = module.GetConfiguration(context, self.path)
self.config.additional_flags = context.node_args
finally: finally:
if file: if file:
file.close() file.close()
@ -774,11 +775,13 @@ TIMEOUT_SCALEFACTOR = {
class Context(object): 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.workspace = workspace
self.buildspace = buildspace self.buildspace = buildspace
self.verbose = verbose self.verbose = verbose
self.vm_root = vm self.vm_root = vm
self.node_args = args
self.timeout = timeout self.timeout = timeout
self.processor = processor self.processor = processor
self.suppress_dialogs = suppress_dialogs self.suppress_dialogs = suppress_dialogs
@ -1281,6 +1284,8 @@ def BuildOptions():
result.add_option("--snapshot", help="Run the tests with snapshot turned on", result.add_option("--snapshot", help="Run the tests with snapshot turned on",
default=False, action="store_true") default=False, action="store_true")
result.add_option("--special-command", default=None) 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", result.add_option("--valgrind", help="Run tests through valgrind",
default=False, action="store_true") default=False, action="store_true")
result.add_option("--cat", help="Print the source of the tests", result.add_option("--cat", help="Print the source of the tests",
@ -1471,6 +1476,7 @@ def Main():
buildspace, buildspace,
VERBOSE, VERBOSE,
shell, shell,
options.node_args,
options.timeout, options.timeout,
processor, processor,
options.suppress_dialogs, options.suppress_dialogs,

Loading…
Cancel
Save