Fix deopt fuzzer variable set up.

Adds the simulator variable configuration from r18959 to the deopt fuzzer.

BUG=
R=jkummerow@chromium.org

Review URL: https://codereview.chromium.org/143403004

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18975 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 5f7bc00d
...@@ -373,6 +373,7 @@ def Execute(arch, mode, args, options, suites, workspace): ...@@ -373,6 +373,7 @@ def Execute(arch, mode, args, options, suites, workspace):
"isolates": options.isolates, "isolates": options.isolates,
"mode": mode, "mode": mode,
"no_i18n": False, "no_i18n": False,
"simulator": utils.UseSimulator(arch),
"system": utils.GuessOS(), "system": utils.GuessOS(),
} }
all_tests = [] all_tests = []
......
...@@ -388,13 +388,6 @@ def Execute(arch, mode, args, options, suites, workspace): ...@@ -388,13 +388,6 @@ def Execute(arch, mode, args, options, suites, workspace):
options.no_i18n) options.no_i18n)
# Find available test suites and read test cases from them. # Find available test suites and read test cases from them.
machine = platform.machine()
if (machine and
(arch == "mipsel" or arch == "arm") and
not arch.startswith(machine)):
use_simulator = True
else:
use_simulator = False
variables = { variables = {
"arch": arch, "arch": arch,
"asan": options.asan, "asan": options.asan,
...@@ -403,8 +396,8 @@ def Execute(arch, mode, args, options, suites, workspace): ...@@ -403,8 +396,8 @@ def Execute(arch, mode, args, options, suites, workspace):
"isolates": options.isolates, "isolates": options.isolates,
"mode": mode, "mode": mode,
"no_i18n": options.no_i18n, "no_i18n": options.no_i18n,
"simulator": utils.UseSimulator(arch),
"system": utils.GuessOS(), "system": utils.GuessOS(),
"simulator": use_simulator,
} }
all_tests = [] all_tests = []
num_tests = 0 num_tests = 0
......
...@@ -78,6 +78,13 @@ def GuessOS(): ...@@ -78,6 +78,13 @@ def GuessOS():
return None return None
def UseSimulator(arch):
machine = platform.machine()
return (machine and
(arch == "mipsel" or arch == "arm") and
not arch.startswith(machine))
# This will default to building the 32 bit VM even on machines that are # This will default to building the 32 bit VM even on machines that are
# capable of running the 64 bit VM. # capable of running the 64 bit VM.
def DefaultArch(): def DefaultArch():
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment