aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2013-10-20 23:37:27 +0300
committerJussi Pakkanen <jpakkane@gmail.com>2013-10-20 23:37:27 +0300
commit70057294181892dcf70f05cd51a26922e73f516f (patch)
tree2e2b1b20f0d436ad43687add9dcec3a6d67ee52e
parent92ff302a142885a7816958f4085e271bc5e9e09f (diff)
downloadmeson-70057294181892dcf70f05cd51a26922e73f516f.zip
meson-70057294181892dcf70f05cd51a26922e73f516f.tar.gz
meson-70057294181892dcf70f05cd51a26922e73f516f.tar.bz2
Pass parent envvars to test executables.
-rwxr-xr-xmeson_test.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/meson_test.py b/meson_test.py
index e8b8a12..9d18979 100755
--- a/meson_test.py
+++ b/meson_test.py
@@ -58,8 +58,10 @@ def run_single_test(wrap, test):
else:
cmd = wrap + cmd + test.cmd_args
starttime = time.time()
+ child_env = os.environ.copy()
+ child_env.update(test.env)
p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE,
- env=test.env)
+ env=child_env)
(stdo, stde) = p.communicate()
endtime = time.time()
duration = endtime - starttime