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.

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())