diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 22:11:26 +0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-08-21 22:11:26 +0300 |
| commit | 24d23c3086afe687cc93b26a07f504902f4a0b02 (patch) | |
| tree | 39ae2dbf27d898118fecf17d0bc502d80c7eb2bb /backends.py | |
| parent | cd38e793018c2af2344e74d22fc1c672c325b399 (diff) | |
| download | meson-24d23c3086afe687cc93b26a07f504902f4a0b02.zip meson-24d23c3086afe687cc93b26a07f504902f4a0b02.tar.gz meson-24d23c3086afe687cc93b26a07f504902f4a0b02.tar.bz2 | |
Can add file objects to command line arguments. Closes #235.
Diffstat (limited to 'backends.py')
| -rw-r--r-- | backends.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/backends.py b/backends.py index 760bc52..05e4429 100644 --- a/backends.py +++ b/backends.py @@ -267,8 +267,13 @@ class Backend(): extra_paths = self.determine_windows_extra_paths(exe) else: extra_paths = [] + cmd_args = [] + for a in t.cmd_args: + 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) ts = TestSerialisation(t.get_name(), fname, is_cross, exe_wrapper, - t.is_parallel, t.cmd_args, t.env, t.should_fail, t.valgrind_args, + t.is_parallel, cmd_args, t.env, t.should_fail, t.valgrind_args, t.timeout, extra_paths) arr.append(ts) pickle.dump(arr, datafile) |