Commit b879c1e
tools: fix test.py --shell
This fixes the necessary plumbing to make the --shell argument
have its intended effect.
PR-URL: #26449
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>1 parent b2e27a0 commit b879c1e
1 file changed
Lines changed: 7 additions & 8 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -918,12 +918,12 @@ def GetTestStatus(self, context, sections, defs): | |||
| 918 | 918 | ||
| 919 | 919 | class Context(object): | |
| 920 | 920 | ||
| 921 | - def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail, | ||
| 921 | + def __init__(self, workspace, verbose, vm, args, expect_fail, | ||
| 922 | 922 | timeout, processor, suppress_dialogs, | |
| 923 | 923 | store_unexpected_output, repeat, abort_on_timeout): | |
| 924 | 924 | self.workspace = workspace | |
| 925 | - self.buildspace = buildspace | ||
| 926 | 925 | self.verbose = verbose | |
| 926 | + self.vm = vm | ||
| 927 | 927 | self.node_args = args | |
| 928 | 928 | self.expect_fail = expect_fail | |
| 929 | 929 | self.timeout = timeout | |
@@ -936,6 +936,8 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail, | |||
| 936 | 936 | self.node_has_crypto = True | |
| 937 | 937 | ||
| 938 | 938 | def GetVm(self, arch, mode): | |
| 939 | + if self.vm is not None: | ||
| 940 | + return self.vm | ||
| 939 | 941 | if arch == 'none': | |
| 940 | 942 | name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node' | |
| 941 | 943 | else: | |
@@ -1381,7 +1383,7 @@ def BuildOptions(): | |||
| 1381 | 1383 | dest="suppress_dialogs", default=True, action="store_true") | |
| 1382 | 1384 | result.add_option("--no-suppress-dialogs", help="Display Windows dialogs for crashing tests", | |
| 1383 | 1385 | dest="suppress_dialogs", action="store_false") | |
| 1384 | - result.add_option("--shell", help="Path to V8 shell", default="shell") | ||
| 1386 | + result.add_option("--shell", help="Path to node executable", default=None) | ||
| 1385 | 1387 | result.add_option("--store-unexpected-output", | |
| 1386 | 1388 | help="Store the temporary JS files from tests that fails", | |
| 1387 | 1389 | dest="store_unexpected_output", default=True, action="store_true") | |
@@ -1605,14 +1607,11 @@ def Main(): | |||
| 1605 | 1607 | run_worker = join(workspace, "tools", "run-worker.js") | |
| 1606 | 1608 | options.node_args.append(run_worker) | |
| 1607 | 1609 | ||
| 1608 | - shell = abspath(options.shell) | ||
| 1609 | - buildspace = dirname(shell) | ||
| 1610 | - | ||
| 1611 | 1610 | processor = GetSpecialCommandProcessor(options.special_command) | |
| 1611 | + | ||
| 1612 | 1612 | context = Context(workspace, | |
| 1613 | - buildspace, | ||
| 1614 | 1613 | VERBOSE, | |
| 1615 | - shell, | ||
| 1614 | + options.shell, | ||
| 1616 | 1615 | options.node_args, | |
| 1617 | 1616 | options.expect_fail, | |
| 1618 | 1617 | options.timeout, | |
0 commit comments