diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2021-02-07 12:03:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-07 12:03:10 +0000 |
| commit | 034b81a09f20902c2d8cb907e162c7e6cb48e8c1 (patch) | |
| tree | 80a1b89ab632663ec056d4007d06ba65482f0ec1 /mesonbuild/interpreter.py | |
| parent | 8b82ffa9e423558d7644c7135db4114f59537829 (diff) | |
| parent | c7c2bc8db111a5be277aeb14aecfe0d28ab286a9 (diff) | |
| download | meson-034b81a09f20902c2d8cb907e162c7e6cb48e8c1.zip meson-034b81a09f20902c2d8cb907e162c7e6cb48e8c1.tar.gz meson-034b81a09f20902c2d8cb907e162c7e6cb48e8c1.tar.bz2 | |
Merge pull request #8288 from bonzini/test-setup-exclude-suites
introduce add_test_setup(exclude suites: ...) keyword argument
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index f3d7502..176c1da 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2301,7 +2301,8 @@ permitted_kwargs = {'add_global_arguments': {'language', 'native'}, 'add_languages': {'required', 'native'}, 'add_project_link_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', + 'exclude_suites'}, 'benchmark': _base_test_args, 'build_target': known_build_target_kwargs, 'configure_file': {'input', @@ -4686,8 +4687,10 @@ different subdirectory. raise InterpreterException('\'%s\' is already set as default. ' 'is_default can be set to true only once' % self.build.test_setup_default_name) self.build.test_setup_default_name = setup_name + exclude_suites = mesonlib.stringlistify(kwargs.get('exclude_suites', [])) env = self.unpack_env_kwarg(kwargs) - self.build.test_setups[setup_name] = build.TestSetup(exe_wrapper, gdb, timeout_multiplier, env) + self.build.test_setups[setup_name] = build.TestSetup(exe_wrapper, gdb, timeout_multiplier, env, + exclude_suites) @permittedKwargs(permitted_kwargs['add_global_arguments']) @stringArgs |