aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-08-09 12:23:39 -0700
committerDaniel Mensinger <daniel@mensinger-ka.de>2021-08-20 18:57:19 +0200
commitabababfb93fd6da6636b51583bc0b8bb8c72f1aa (patch)
tree2754fc65897cd5fcf939ed8ff02160901cb8a2eb
parent4d6f15b1f198f48c5c6b78fd3a3829027d7a497c (diff)
downloadmeson-abababfb93fd6da6636b51583bc0b8bb8c72f1aa.zip
meson-abababfb93fd6da6636b51583bc0b8bb8c72f1aa.tar.gz
meson-abababfb93fd6da6636b51583bc0b8bb8c72f1aa.tar.bz2
interpreterobjects: fix Test annotations
-rw-r--r--mesonbuild/interpreter/interpreterobjects.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/mesonbuild/interpreter/interpreterobjects.py b/mesonbuild/interpreter/interpreterobjects.py
index 9da3456..2bff1bb 100644
--- a/mesonbuild/interpreter/interpreterobjects.py
+++ b/mesonbuild/interpreter/interpreterobjects.py
@@ -668,9 +668,12 @@ class GeneratedObjectsHolder(ObjectHolder[build.ExtractedObjects]):
pass
class Test(MesonInterpreterObject):
- def __init__(self, name: str, project: str, suite: T.List[str], exe: build.Executable,
+ def __init__(self, name: str, project: str, suite: T.List[str],
+ exe: T.Union[ExternalProgram, build.Executable, build.CustomTarget],
depends: T.List[T.Union[build.CustomTarget, build.BuildTarget]],
- is_parallel: bool, cmd_args: T.List[str], env: build.EnvironmentVariables,
+ is_parallel: bool,
+ 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):
super().__init__()
@@ -688,7 +691,7 @@ class Test(MesonInterpreterObject):
self.protocol = TestProtocol.from_str(protocol)
self.priority = priority
- def get_exe(self) -> build.Executable:
+ def get_exe(self) -> T.Union[ExternalProgram, build.Executable, build.CustomTarget]:
return self.exe
def get_name(self) -> str: