diff options
author | Dylan Baker <dylan@pnwbakers.com> | 2019-09-27 08:32:01 -0700 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-09-28 18:11:06 +0300 |
commit | f724cc2042681357be93842e5e752fe36fd49ade (patch) | |
tree | e41a0f96da3ba79cdcc6a2c18cce8a476715df0e | |
parent | 714908e5d9ce8aa02eef1563727a78766ac9a4a5 (diff) | |
download | meson-f724cc2042681357be93842e5e752fe36fd49ade.zip meson-f724cc2042681357be93842e5e752fe36fd49ade.tar.gz meson-f724cc2042681357be93842e5e752fe36fd49ade.tar.bz2 |
backends: Add needs_exe_wrapper to test serialization
We need to know if the test actually needs an exe wrapper to run or not.
-rw-r--r-- | mesonbuild/backend/backends.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py index 30de716..4d3f5d9 100644 --- a/mesonbuild/backend/backends.py +++ b/mesonbuild/backend/backends.py @@ -83,7 +83,7 @@ class ExecutableSerialisation: class TestSerialisation: def __init__(self, name: str, project: str, suite: str, fname: typing.List[str], is_cross_built: bool, exe_wrapper: typing.Optional[build.Executable], - is_parallel: bool, cmd_args: typing.List[str], + needs_exe_wrapper: bool, is_parallel: bool, cmd_args: typing.List[str], env: build.EnvironmentVariables, should_fail: bool, timeout: typing.Optional[int], workdir: typing.Optional[str], extra_paths: typing.List[str], protocol: str, priority: int): @@ -104,6 +104,7 @@ class TestSerialisation: self.extra_paths = extra_paths self.protocol = protocol self.priority = priority + self.needs_exe_wrapper = needs_exe_wrapper def get_backend_from_name(backend, build): if backend == 'ninja': @@ -748,7 +749,8 @@ class Backend: else: raise MesonException('Bad object in test command.') ts = TestSerialisation(t.get_name(), t.project_name, t.suite, cmd, is_cross, - exe_wrapper, t.is_parallel, cmd_args, t.env, + exe_wrapper, self.environment.need_exe_wrapper(), + t.is_parallel, cmd_args, t.env, t.should_fail, t.timeout, t.workdir, extra_paths, t.protocol, t.priority) arr.append(ts) |