Commit 23a584d
test: allow passing args to executable
Add --node-args option that will pass arguments.
PR-URL: #5376
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>1 parent 7e51966 commit 23a584d
2 files changed
Lines changed: 7 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -4,7 +4,6 @@ const assert = require('assert'); | |||
| 4 | 4 | const cluster = require('cluster'); | |
| 5 | 5 | ||
| 6 | 6 | if (cluster.isMaster) { | |
| 7 | - assert.strictEqual(process.execArgv.length, 0, 'run test with no args'); | ||
| 8 | 7 | ||
| 9 | 8 | function checkExitCode(code, signal) { | |
| 10 | 9 | assert.strictEqual(code, 0); | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -709,6 +709,7 @@ def GetConfiguration(self, context): | |||
| 709 | 709 | (file, pathname, description) = imp.find_module('testcfg', [ self.path ]) | |
| 710 | 710 | module = imp.load_module('testcfg', file, pathname, description) | |
| 711 | 711 | self.config = module.GetConfiguration(context, self.path) | |
| 712 | + self.config.additional_flags = context.node_args | ||
| 712 | 713 | finally: | |
| 713 | 714 | if file: | |
| 714 | 715 | file.close() | |
@@ -774,11 +775,13 @@ def GetTestStatus(self, context, sections, defs): | |||
| 774 | 775 | ||
| 775 | 776 | class Context(object): | |
| 776 | 777 | ||
| 777 | - def __init__(self, workspace, buildspace, verbose, vm, timeout, processor, suppress_dialogs, store_unexpected_output): | ||
| 778 | + def __init__(self, workspace, buildspace, verbose, vm, args, timeout, | ||
| 779 | + processor, suppress_dialogs, store_unexpected_output): | ||
| 778 | 780 | self.workspace = workspace | |
| 779 | 781 | self.buildspace = buildspace | |
| 780 | 782 | self.verbose = verbose | |
| 781 | 783 | self.vm_root = vm | |
| 784 | + self.node_args = args | ||
| 782 | 785 | self.timeout = timeout | |
| 783 | 786 | self.processor = processor | |
| 784 | 787 | self.suppress_dialogs = suppress_dialogs | |
@@ -1281,6 +1284,8 @@ def BuildOptions(): | |||
| 1281 | 1284 | result.add_option("--snapshot", help="Run the tests with snapshot turned on", | |
| 1282 | 1285 | default=False, action="store_true") | |
| 1283 | 1286 | result.add_option("--special-command", default=None) | |
| 1287 | + result.add_option("--node-args", dest="node_args", help="Args to pass through to Node", | ||
| 1288 | + default=[], action="append") | ||
| 1284 | 1289 | result.add_option("--valgrind", help="Run tests through valgrind", | |
| 1285 | 1290 | default=False, action="store_true") | |
| 1286 | 1291 | result.add_option("--cat", help="Print the source of the tests", | |
@@ -1471,6 +1476,7 @@ def Main(): | |||
| 1471 | 1476 | buildspace, | |
| 1472 | 1477 | VERBOSE, | |
| 1473 | 1478 | shell, | |
| 1479 | + options.node_args, | ||
| 1474 | 1480 | options.timeout, | |
| 1475 | 1481 | processor, | |
| 1476 | 1482 | options.suppress_dialogs, | |
0 commit comments