mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 791759 - Fix jit-tests default jitflags. r=dmandelin
--HG-- extra : rebase_source : c1106b9936d7deb15e03ccb322abb75f1e19b3c6
This commit is contained in:
parent
09eea9026a
commit
744ae80efb
@ -53,7 +53,8 @@ The general format in EBNF is:
|
||||
item ::= flag | attribute
|
||||
|
||||
flag ::= "slow" | "allow-oom" | "valgrind" | "tz-pacific" |
|
||||
"mjitalways" | "debug" |
|
||||
"mjit" | "mjitalways" | "ion-eager" | "debug" |
|
||||
"dump-bytecode" |
|
||||
|
||||
|
||||
attribute ::= name ":" value
|
||||
@ -69,7 +70,9 @@ The meaning of the items:
|
||||
allow-oom If the test runs out of memory, it counts as passing.
|
||||
valgrind Run test under valgrind.
|
||||
tz-pacific Always run test with the Pacific time zone (TZ=PST8PDT).
|
||||
mjit Run js with -m, whether --jitflags says to or not
|
||||
mjitalways Run js with -a, whether --jitflags says to or not
|
||||
ion-eager Run js with --ion-eager, whether --jitflags says to or not
|
||||
debug Run js with -d, whether --jitflags says to or not
|
||||
dump-bytecode Run js with -D, whether --jitflags says to or not
|
||||
|
||||
|
@ -49,7 +49,7 @@ os.path.relpath = _relpath
|
||||
class Test:
|
||||
def __init__(self, path):
|
||||
self.path = path # path to test file
|
||||
|
||||
|
||||
self.jitflags = [] # jit flags to enable
|
||||
self.slow = False # True means the test is slow-running
|
||||
self.allow_oom = False # True means that OOM is not considered a failure
|
||||
@ -204,7 +204,7 @@ def run_cmd(cmdline, env, timeout):
|
||||
def run_cmd_avoid_stdio(cmdline, env, timeout):
|
||||
stdoutPath, stderrPath = tmppath('jsstdout'), tmppath('jsstderr')
|
||||
env['JS_STDOUT'] = stdoutPath
|
||||
env['JS_STDERR'] = stderrPath
|
||||
env['JS_STDERR'] = stderrPath
|
||||
_, __, code = run_timeout_cmd(cmdline, { 'env': env }, timeout)
|
||||
return read_and_unlink(stdoutPath), read_and_unlink(stderrPath), code
|
||||
|
||||
@ -362,7 +362,7 @@ def run_tests(tests, test_dir, lib_dir, shell_args):
|
||||
return True
|
||||
|
||||
def parse_jitflags():
|
||||
jitflags = [ [ '-' + flag for flag in flags ]
|
||||
jitflags = [ [ '-' + flag for flag in flags ]
|
||||
for flags in OPTIONS.jitflags.split(',') ]
|
||||
for flags in jitflags:
|
||||
for flag in flags:
|
||||
@ -402,7 +402,7 @@ def main(argv):
|
||||
op = OptionParser(usage='%prog [options] JS_SHELL [TESTS]')
|
||||
op.add_option('-s', '--show-cmd', dest='show_cmd', action='store_true',
|
||||
help='show js shell command run')
|
||||
op.add_option('-f', '--show-failed-cmd', dest='show_failed',
|
||||
op.add_option('-f', '--show-failed-cmd', dest='show_failed',
|
||||
action='store_true', help='show command lines of failed tests')
|
||||
op.add_option('-o', '--show-output', dest='show_output', action='store_true',
|
||||
help='show output from js shell')
|
||||
@ -430,8 +430,9 @@ def main(argv):
|
||||
help='Enable the |valgrind| flag, if valgrind is in $PATH.')
|
||||
op.add_option('--valgrind-all', dest='valgrind_all', action='store_true',
|
||||
help='Run all tests with valgrind, if valgrind is in $PATH.')
|
||||
op.add_option('--jitflags', dest='jitflags', default='m,mn',
|
||||
help='Example: --jitflags=m,mn to run each test with -m, -m -n [default=%default]')
|
||||
op.add_option('--jitflags', dest='jitflags', default='',
|
||||
help='Example: --jitflags=m,mn to run each test with "-m" and "-m -n" [default="%default"]. ' +
|
||||
'Long flags, such as "--no-jm", should be set using --args.')
|
||||
op.add_option('--avoid-stdio', dest='avoid_stdio', action='store_true',
|
||||
help='Use js-shell file indirection instead of piping stdio.')
|
||||
op.add_option('--write-failure-output', dest='write_failure_output', action='store_true',
|
||||
|
Loading…
Reference in New Issue
Block a user