aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorMathieu Duponchelle <mathieu@centricular.com>2018-05-18 00:38:18 +0200
committerNirbheek Chauhan <nirbheek.chauhan@gmail.com>2018-06-02 11:42:48 +0000
commit35ab34d6cdc47952849c076885a8148781562733 (patch)
tree6aa3b29d924e0c852e71e6834eed6e8bc191282d /mesonbuild
parent968f2c63af19d91170b5f1affa3dfff7b30f7d37 (diff)
downloadmeson-35ab34d6cdc47952849c076885a8148781562733.zip
meson-35ab34d6cdc47952849c076885a8148781562733.tar.gz
meson-35ab34d6cdc47952849c076885a8148781562733.tar.bz2
test serialisation: determine windows extra paths ..
.. for executable arguments too. This makes it possible to pass an executable to a test, which can then run it in an appropriate environment.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/backend/backends.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/mesonbuild/backend/backends.py b/mesonbuild/backend/backends.py
index 02ce52d..c39c031 100644
--- a/mesonbuild/backend/backends.py
+++ b/mesonbuild/backend/backends.py
@@ -625,6 +625,8 @@ class Backend:
for a in t.cmd_args:
if hasattr(a, 'held_object'):
a = a.held_object
+ if isinstance(a, build.Executable):
+ extra_paths += self.determine_windows_extra_paths(a, [])
if isinstance(a, mesonlib.File):
a = os.path.join(self.environment.get_build_dir(), a.rel_to_builddir(self.build_to_src))
cmd_args.append(a)