diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-01-15 23:36:42 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-02-01 09:05:26 +0100 |
| commit | fc661c35a20a7cc85f76e5e0c502700f42e27cf2 (patch) | |
| tree | 55fdc3213419420b3fa7c9c2480f6819d377cc6e /mesonbuild | |
| parent | 3f3439522c66de4620f36f804bdf16c5d0dc9ce1 (diff) | |
| download | meson-fc661c35a20a7cc85f76e5e0c502700f42e27cf2.zip meson-fc661c35a20a7cc85f76e5e0c502700f42e27cf2.tar.gz meson-fc661c35a20a7cc85f76e5e0c502700f42e27cf2.tar.bz2 | |
interpreter: support for forcibly verbose logging of some tests
Add a new keyword argument to test() and benchmark(), completing the
implementation of the feature.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/backend/backends.py | 2 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreter.py | 4 | ||||
| -rw-r--r-- | mesonbuild/interpreter/interpreterobjects.py | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 8729c8e..bc4a02c 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -1150,7 +1150,7 @@ class Backend: isinstance(exe, build.Executable), [x.get_id() for x in depends], self.environment.coredata.version, - False) + t.verbose) arr.append(ts) return arr diff --git a/mesonbuild/interpreter/interpreter.py b/mesonbuild/interpreter/interpreter.py index 7681834..c83d09e 100644 --- a/mesonbuild/interpreter/interpreter.py +++ b/mesonbuild/interpreter/interpreter.py @@ -215,6 +215,7 @@ TEST_KWARGS: T.List[KwargInfo] = [ ENV_KW, DEPENDS_KW.evolve(since='0.46.0'), KwargInfo('suite', ContainerTypeInfo(list, str), listify=True, default=['']), # yes, a list of empty string + KwargInfo('verbose', bool, default=False, since='0.62.0'), ] permitted_dependency_kwargs = { @@ -1972,7 +1973,8 @@ external dependencies (including libraries) must go to "dependencies".''') kwargs['timeout'], kwargs['workdir'], kwargs['protocol'], - kwargs['priority']) + kwargs['priority'], + kwargs['verbose']) def add_test(self, node: mparser.BaseNode, args: T.List, kwargs: T.Dict[str, T.Any], is_base_test: bool): t = self.make_test(node, args, kwargs) diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py index 2656f14..9c2481c 100644 --- a/mesonbuild/interpreter/interpreterobjects.py +++ b/mesonbuild/interpreter/interpreterobjects.py @@ -636,7 +636,7 @@ class Test(MesonInterpreterObject): cmd_args: T.List[T.Union[str, mesonlib.File, build.Target]], env: build.EnvironmentVariables, should_fail: bool, timeout: int, workdir: T.Optional[str], protocol: str, - priority: int): + priority: int, verbose: bool): super().__init__() self.name = name self.suite = listify(suite) @@ -651,6 +651,7 @@ class Test(MesonInterpreterObject): self.workdir = workdir self.protocol = TestProtocol.from_str(protocol) self.priority = priority + self.verbose = verbose def get_exe(self) -> T.Union[ExternalProgram, build.Executable, build.CustomTarget]: return self.exe |