aboutsummaryrefslogtreecommitdiff
path: root/run_tests.py
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2021-02-19 12:11:36 -0800
committerDylan Baker <dylan@pnwbakers.com>2021-02-23 08:38:19 -0800
commit3e11da6db5beeb42008d8d807858e054f1129206 (patch)
treea658ac6e4d4efe7f39442cbeb3d9b3ca67576871 /run_tests.py
parent8a12115741185a007c1dd0d172af98bb42052146 (diff)
downloadmeson-3e11da6db5beeb42008d8d807858e054f1129206.zip
meson-3e11da6db5beeb42008d8d807858e054f1129206.tar.gz
meson-3e11da6db5beeb42008d8d807858e054f1129206.tar.bz2
run_*_tests: Add some type annotations
Diffstat (limited to 'run_tests.py')
-rwxr-xr-xrun_tests.py31
1 files changed, 19 insertions, 12 deletions
diff --git a/run_tests.py b/run_tests.py
index 24d6a51..5a0a70c 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -27,6 +27,8 @@ from enum import Enum
from glob import glob
from pathlib import Path
from unittest import mock
+import typing as T
+
from mesonbuild import compilers
from mesonbuild import dependencies
from mesonbuild import mesonlib
@@ -57,26 +59,27 @@ else:
if NINJA_CMD is None:
raise RuntimeError('Could not find Ninja v1.7 or newer')
-def guess_backend(backend, msbuild_exe: str):
+def guess_backend(backend_str: str, msbuild_exe: str) -> T.Tuple['Backend', T.List[str]]:
# Auto-detect backend if unspecified
backend_flags = []
- if backend is None:
+ if backend_str is None:
if msbuild_exe is not None and (mesonlib.is_windows() and not _using_intelcl()):
- backend = 'vs' # Meson will auto-detect VS version to use
+ backend_str = 'vs' # Meson will auto-detect VS version to use
else:
- backend = 'ninja'
+ backend_str = 'ninja'
+
# Set backend arguments for Meson
- if backend.startswith('vs'):
- backend_flags = ['--backend=' + backend]
+ if backend_str.startswith('vs'):
+ backend_flags = ['--backend=' + backend_str]
backend = Backend.vs
- elif backend == 'xcode':
+ elif backend_str == 'xcode':
backend_flags = ['--backend=xcode']
backend = Backend.xcode
- elif backend == 'ninja':
+ elif backend_str == 'ninja':
backend_flags = ['--backend=ninja']
backend = Backend.ninja
else:
- raise RuntimeError('Unknown backend: {!r}'.format(backend))
+ raise RuntimeError('Unknown backend: {!r}'.format(backend_str))
return (backend, backend_flags)
@@ -208,9 +211,13 @@ def get_builddir_target_args(backend, builddir, target):
raise AssertionError('Unknown backend: {!r}'.format(backend))
return target_args + dir_args
-def get_backend_commands(backend, debug=False):
- install_cmd = []
- uninstall_cmd = []
+def get_backend_commands(backend: Backend, debug: bool = False) -> \
+ T.Tuple[T.List[str], T.List[str], T.List[str], T.List[str], T.List[str]]:
+ install_cmd: T.List[str] = []
+ uninstall_cmd: T.List[str] = []
+ clean_cmd: T.List[str]
+ cmd: T.List[str]
+ test_cmd: T.List[str]
if backend is Backend.vs:
cmd = ['msbuild']
clean_cmd = cmd + ['/target:Clean']