Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools: fix test.py --shell #26449

Closed
wants to merge 1 commit into from
Closed

tools: fix test.py --shell #26449

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,12 +918,12 @@ def GetTestStatus(self, context, sections, defs):

class Context(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
Expand All @@ -936,6 +936,8 @@ def __init__(self, workspace, buildspace, verbose, vm, args, expect_fail,
self.node_has_crypto = True

def GetVm(self, arch, mode):
if self.vm is not None:
return self.vm
if arch == 'none':
name = 'out/Debug/node' if mode == 'debug' else 'out/Release/node'
else:
Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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,
Expand Down