diff options
Diffstat (limited to 'src/3rdparty/v8/tools/test.py')
-rwxr-xr-x | src/3rdparty/v8/tools/test.py | 29 |
1 files changed, 10 insertions, 19 deletions
diff --git a/src/3rdparty/v8/tools/test.py b/src/3rdparty/v8/tools/test.py index 0aacd99..b3b62b3 100755 --- a/src/3rdparty/v8/tools/test.py +++ b/src/3rdparty/v8/tools/test.py @@ -140,9 +140,9 @@ def EscapeCommand(command): parts = [] for part in command: if ' ' in part: - # Escape spaces. We may need to escape more characters for this - # to work properly. - parts.append('"%s"' % part) + # Escape spaces and double quotes. We may need to escape more characters + # for this to work properly. + parts.append('"%s"' % part.replace('"', '\\"')) else: parts.append(part) return " ".join(parts) @@ -299,8 +299,6 @@ class MonochromeProgressIndicator(CompactProgressIndicator): 'status_line': "[%(mins)02i:%(secs)02i|%%%(remaining) 4d|+%(passed) 4d|-%(failed) 4d]: %(test)s", 'stdout': '%s', 'stderr': '%s', - 'clear': lambda last_line_length: ("\r" + (" " * last_line_length) + "\r"), - 'max_length': 78 } super(MonochromeProgressIndicator, self).__init__(cases, templates) @@ -686,8 +684,9 @@ SUFFIX = { 'debug' : '_g', 'release' : '' } FLAGS = { - 'debug' : ['--nobreak-on-abort', '--enable-slow-asserts', '--debug-code', '--verify-heap'], - 'release' : ['--nobreak-on-abort']} + 'debug' : ['--nobreak-on-abort', '--nodead-code-elimination', + '--enable-slow-asserts', '--debug-code', '--verify-heap'], + 'release' : ['--nobreak-on-abort', '--nodead-code-elimination']} TIMEOUT_SCALEFACTOR = { 'debug' : 4, 'release' : 1 } @@ -1246,9 +1245,6 @@ def BuildOptions(): result.add_option("--nostress", help="Don't run crankshaft --always-opt --stress-op test", default=False, action="store_true") - result.add_option("--crankshaft", - help="Run with the --crankshaft flag", - default=False, action="store_true") result.add_option("--shard-count", help="Split testsuites into this number of shards", default=1, type="int") @@ -1286,7 +1282,7 @@ def ProcessOptions(options): options.scons_flags.append("arch=" + options.arch) # Simulators are slow, therefore allow a longer default timeout. if options.timeout == -1: - if options.arch == 'arm' or options.arch == 'mips': + if options.arch in ['android', 'arm', 'mipsel']: options.timeout = 2 * TIMEOUT_DEFAULT; else: options.timeout = TIMEOUT_DEFAULT; @@ -1300,11 +1296,6 @@ def ProcessOptions(options): VARIANT_FLAGS = [['--stress-opt', '--always-opt']] if options.nostress: VARIANT_FLAGS = [[],['--nocrankshaft']] - if options.crankshaft: - if options.special_command: - options.special_command += " --crankshaft" - else: - options.special_command = "@ --crankshaft" if options.shell.endswith("d8"): if options.special_command: options.special_command += " --test" @@ -1380,8 +1371,9 @@ def GetSpecialCommandProcessor(value): else: pos = value.find('@') import urllib - prefix = urllib.unquote(value[:pos]).split() - suffix = urllib.unquote(value[pos+1:]).split() + import shlex + prefix = shlex.split(urllib.unquote(value[:pos])) + suffix = shlex.split(urllib.unquote(value[pos+1:])) def ExpandCommand(args): return prefix + args + suffix return ExpandCommand @@ -1493,7 +1485,6 @@ def Main(): 'system': utils.GuessOS(), 'arch': options.arch, 'simulator': options.simulator, - 'crankshaft': options.crankshaft, 'isolates': options.isolates } test_list = root.ListTests([], path, context, mode, []) |