diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-09 22:24:49 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2018-05-09 22:24:49 +0530 |
| commit | a3d946e05295333990deeb667370314ada5a505a (patch) | |
| tree | 1614b8e1f09344641ac612751c87b8296c705097 | |
| parent | f4dca394821c7dd2eb312e3cb2f38d9b2663cc3b (diff) | |
| download | meson-nirbheek/fix-test-setup-env.tar.gz | |
test setups: Inherit env when using a test setupnirbheek/fix-test-setup-env
Closes https://github.com/mesonbuild/meson/issues/3525
| -rw-r--r-- | mesonbuild/build.py | 2 | ||||
| -rwxr-xr-x | test cases/unit/2 testsetups/envcheck.py | 6 | ||||
| -rw-r--r-- | test cases/unit/2 testsetups/meson.build | 3 |
3 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index 5d1163bb4..175066102 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -290,7 +290,7 @@ class EnvironmentVariables: return value def get_env(self, full_env): - env = {} + env = full_env.copy() for method, name, values, kwargs in self.envvars: env[name] = method(full_env, name, values, kwargs) return env diff --git a/test cases/unit/2 testsetups/envcheck.py b/test cases/unit/2 testsetups/envcheck.py new file mode 100755 index 000000000..9c306e43d --- /dev/null +++ b/test cases/unit/2 testsetups/envcheck.py @@ -0,0 +1,6 @@ +#!/usr/bin/env python3 + +import os +import sys + +assert('PATH' in os.environ) diff --git a/test cases/unit/2 testsetups/meson.build b/test cases/unit/2 testsetups/meson.build index 58b099dde..83438569a 100644 --- a/test cases/unit/2 testsetups/meson.build +++ b/test cases/unit/2 testsetups/meson.build @@ -14,6 +14,9 @@ add_test_setup('valgrind', buggy = executable('buggy', 'buggy.c', 'impl.c') test('Test buggy', buggy) +envcheck = find_program('envcheck.py') +test('test-env', envcheck) + add_test_setup('empty') add_test_setup('onlyenv', env : env) add_test_setup('onlyenv2', env : 'TEST_ENV=1') |