Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

interpreter: Correctly handle arguments to benchmark 

This fixes two separate issues, one is that benchmark warns about
depends and priority; The other is that we passed bad values like
is_parallel into the test and would actually run benchmarks in parallel,
which is bad.
This commit is contained in:
Dylan Baker 2019-10-02 13:35:15 -07:00
parent 8d3fcb3dc4
commit 0fb1d029b6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mesonbuild/interpreter.py
View File

@ -1954,7 +1954,7 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'},
'add_project_link_arguments': {'language', 'native'}, 'add_project_link_arguments': {'language', 'native'},
'add_project_arguments': {'language', 'native'}, 'add_project_arguments': {'language', 'native'},
'add_test_setup': {'exe_wrapper', 'gdb', 'timeout_multiplier', 'env', 'is_default'}, 'add_test_setup': {'exe_wrapper', 'gdb', 'timeout_multiplier', 'env', 'is_default'},
'benchmark': {'args', 'env', 'should_fail', 'timeout', 'workdir', 'suite'}, 'benchmark': {'args', 'depends', 'env', 'should_fail', 'timeout', 'workdir', 'suite', 'priority', 'protocol'},
'build_target': known_build_target_kwargs, 'build_target': known_build_target_kwargs,
'configure_file': {'input', 'configure_file': {'input',
'output', 'output',
@ -3364,8 +3364,13 @@ This will become a hard error in the future.''' % kwargs['input'], location=self
self.generators.append(gen) self.generators.append(gen)
return gen return gen
@FeatureNewKwargs('benchmark', '0.46.0', ['depends'])
@FeatureNewKwargs('benchmark', '0.52.0', ['priority'])
@permittedKwargs(permitted_kwargs['benchmark']) @permittedKwargs(permitted_kwargs['benchmark'])
def func_benchmark(self, node, args, kwargs): def func_benchmark(self, node, args, kwargs):
# is_parallel isn't valid here, so make sure it isn't passed
if 'is_parallel' in kwargs:
del kwargs['is_parallel']
self.add_test(node, args, kwargs, False) self.add_test(node, args, kwargs, False)
@FeatureNewKwargs('test', '0.46.0', ['depends']) @FeatureNewKwargs('test', '0.46.0', ['depends'])