aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan@pnwbakers.com>2019-05-14 16:36:10 -0700
committerDylan Baker <dylan@pnwbakers.com>2019-05-14 16:43:29 -0700
commit502a684872d6ffd80f31c61ce67e5d856b472da2 (patch)
tree030afa2f98701f4b6b67d574b74392abaec76cc3
parent285db6637dd1884df4b7eb290ba9ef0b50fa0baa (diff)
downloadmeson-502a684872d6ffd80f31c61ce67e5d856b472da2.zip
meson-502a684872d6ffd80f31c61ce67e5d856b472da2.tar.gz
meson-502a684872d6ffd80f31c61ce67e5d856b472da2.tar.bz2
build: TestSetup doesn't take keyword arguments
This function is currently setup with keyword arguments defaulting to None. However, it is never called without passing all of it's arguments explicitly, and only one of it's arguments would actually be valid as None. So just drop that, and make them all positional. And annotate them.
-rw-r--r--mesonbuild/build.py4
-rw-r--r--mesonbuild/interpreter.py5
2 files changed, 4 insertions, 5 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py
index bc17445..363b34f 100644
--- a/mesonbuild/build.py
+++ b/mesonbuild/build.py
@@ -19,6 +19,7 @@ import itertools, pathlib
import hashlib
import pickle
from functools import lru_cache
+import typing
from . import environment
from . import dependencies
@@ -2359,7 +2360,8 @@ class RunScript(dict):
self['args'] = args
class TestSetup:
- def __init__(self, *, exe_wrapper=None, gdb=None, timeout_multiplier=None, env=None):
+ def __init__(self, exe_wrapper: typing.Optional[typing.List[str]], gdb: bool,
+ timeout_multiplier: int, env: EnvironmentVariables):
self.exe_wrapper = exe_wrapper
self.gdb = gdb
self.timeout_multiplier = timeout_multiplier
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index d4c454c..e2b9631 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -3765,10 +3765,7 @@ different subdirectory.
'is_default can be set to true only once' % self.build.test_setup_default_name)
self.build.test_setup_default_name = setup_name
env = self.unpack_env_kwarg(kwargs)
- self.build.test_setups[setup_name] = build.TestSetup(exe_wrapper=exe_wrapper,
- gdb=gdb,
- timeout_multiplier=timeout_multiplier,
- env=env)
+ self.build.test_setups[setup_name] = build.TestSetup(exe_wrapper, gdb, timeout_multiplier, env)
def get_argdict_on_crossness(self, native_dict, cross_dict, kwargs):
for_native = kwargs.get('native', not self.environment.is_cross_build())