diff options
| author | Thibault Saunier <saunierthibault@gmail.com> | 2016-09-14 17:11:27 -0300 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-09-14 23:11:27 +0300 |
| commit | a2e7ebc575a47bfb3dfb774591cde3fdc6873dc9 (patch) | |
| tree | bde1198cb0fde59c2ca09b78ff7a832a38aad238 /mesonbuild/scripts/meson_test.py | |
| parent | 8fd8c16a879742a840b8f3a431539a261b8552ba (diff) | |
| download | meson-a2e7ebc575a47bfb3dfb774591cde3fdc6873dc9.zip meson-a2e7ebc575a47bfb3dfb774591cde3fdc6873dc9.tar.gz meson-a2e7ebc575a47bfb3dfb774591cde3fdc6873dc9.tar.bz2 | |
Add a new 'environment' object to be used to build test environment (#781)
Allowing user to fine tune tests environment variables
Diffstat (limited to 'mesonbuild/scripts/meson_test.py')
| -rw-r--r-- | mesonbuild/scripts/meson_test.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/mesonbuild/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py index ab21654..acf7cd5 100644 --- a/mesonbuild/scripts/meson_test.py +++ b/mesonbuild/scripts/meson_test.py @@ -15,6 +15,7 @@ # limitations under the License. import mesonbuild +from .. import build import sys, os, subprocess, time, datetime, pickle, multiprocessing, json import concurrent.futures as conc import argparse @@ -128,6 +129,9 @@ def run_single_test(wrap, test): cmd = wrap + cmd + test.cmd_args starttime = time.time() child_env = os.environ.copy() + if isinstance(test.env, build.EnvironmentVariables): + test.env = test.env.get_env(child_env) + child_env.update(test.env) if len(test.extra_paths) > 0: child_env['PATH'] = child_env['PATH'] + ';'.join([''] + test.extra_paths) |