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>

Author: hashseed

tools/test.py

@@ -918,12 +918,12 @@ def GetTestStatus(self, context, sections, defs):
 
 classContext(object):
 
-def__init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
+def__init__(self, workspace, verbose, vm, args, expect_fail,
 timeout, processor, suppress_dialogs,
 store_unexpected_output, repeat, abort_on_timeout):
 self.workspace=workspace
-self.buildspace=buildspace
 self.verbose=verbose
+self.vm=vm
 self.node_args=args
 self.expect_fail=expect_fail
 self.timeout=timeout
@@ -936,6 +936,8 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
 self.node_has_crypto=True
 
 defGetVm(self, arch, mode):
+ifself.vmisnotNone:
+returnself.vm
 ifarch=='none':
 name='out/Debug/node'ifmode=='debug'else'out/Release/node'
 else:
@@ -1381,7 +1383,7 @@ def BuildOptions():
 dest="suppress_dialogs", default=True, action="store_true")
 result.add_option("--no-suppress-dialogs", help="Display Windows dialogs for crashing tests",
 dest="suppress_dialogs", action="store_false")
-result.add_option("--shell", help="Path to V8 shell", default="shell")
+result.add_option("--shell", help="Path to node executable", default=None)
 result.add_option("--store-unexpected-output",
 help="Store the temporary JS files from tests that fails",
 dest="store_unexpected_output", default=True, action="store_true")
@@ -1605,14 +1607,11 @@ def Main():
 run_worker=join(workspace, "tools", "run-worker.js")
 options.node_args.append(run_worker)
 
-shell=abspath(options.shell)
-buildspace=dirname(shell)
-
 processor=GetSpecialCommandProcessor(options.special_command)
+
 context=Context(workspace,
-buildspace,
 VERBOSE,
-shell,
+options.shell,
 options.node_args,
 options.expect_fail,
 options.timeout,