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/build.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/build.py')
| -rw-r--r-- | mesonbuild/build.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 4abc800..160ee9a 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -39,7 +39,6 @@ from .linkers import StaticLinker from .interpreterbase import FeatureNew if T.TYPE_CHECKING: - from .coredata import KeyedOptionDictType, OptionDictType from .interpreter import Test from .mesonlib import FileMode, FileOrString @@ -2325,7 +2324,7 @@ class CustomTarget(Target, CommandBase): for ed in unholder(extra_deps): if not isinstance(ed, (CustomTarget, BuildTarget)): raise InvalidArguments('Can only depend on toplevel targets: custom_target or build_target (executable or a library) got: {}({})' - .format(type(ed), ed)) + .format(type(ed), ed)) self.extra_depends.append(ed) for i in depend_files: if isinstance(i, (File, str)): @@ -2620,11 +2619,13 @@ class Data: class TestSetup: def __init__(self, exe_wrapper: T.Optional[T.List[str]], gdb: bool, - timeout_multiplier: int, env: EnvironmentVariables): + timeout_multiplier: int, env: EnvironmentVariables, + exclude_suites: T.List[str]): self.exe_wrapper = exe_wrapper self.gdb = gdb self.timeout_multiplier = timeout_multiplier self.env = env + self.exclude_suites = exclude_suites def get_sources_string_names(sources, backend): ''' |