summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhipeng Xue <543984341@qq.com>2024-07-11 17:00:41 +0800
committerDylan Baker <dylan@pnwbakers.com>2024-07-11 09:04:40 -0700
commit85483295867dbc0c2ab1357b9fe0ca40e320e8a3 (patch)
treee1779e306b5340445451c5deece476ca51e4a8ee
parent0d7bb776e2d97d406b726b90090bbfa8df13232b (diff)
downloadmeson-85483295867dbc0c2ab1357b9fe0ca40e320e8a3.tar.gz
Fix Type hints
-rw-r--r--mesonbuild/environment.py2
-rwxr-xr-xrun_tests.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 62498498d..1dcd2291d 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -154,7 +154,7 @@ def find_coverage_tools(coredata: coredata.CoreData) -> T.Tuple[T.Optional[str],
return gcovr_exe, gcovr_version, lcov_exe, lcov_version, genhtml_exe, llvm_cov_exe
-def detect_ninja(version: str = '1.8.2', log: bool = False) -> T.List[str]:
+def detect_ninja(version: str = '1.8.2', log: bool = False) -> T.Optional[T.List[str]]:
r = detect_ninja_command_and_version(version, log)
return r[0] if r else None
diff --git a/run_tests.py b/run_tests.py
index 87a8f1314..36ec689e1 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -284,7 +284,7 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
raise AssertionError(f'Unknown backend: {backend!r}')
return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd
-def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]:
+def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str]:
out = StringIO()
with mock.patch.object(sys, 'stdout', out), mock.patch.object(sys, 'stderr', out):
returncode = mtest.run_with_args(commandlist)