diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-06 23:13:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-06 23:13:55 +0300 |
| commit | 9361666bd832132346b3a1195d86ad479a9a17b5 (patch) | |
| tree | 254f5aec05523bfec6a16ebc3c72b38f1201687d /mesonbuild/interpreter.py | |
| parent | 2cabcb39c9f8ebc8c525a5168df7f036c7cb5ef7 (diff) | |
| parent | 64950bd318787648c6753a1290c52f627c0e45a3 (diff) | |
| download | meson-9361666bd832132346b3a1195d86ad479a9a17b5.zip meson-9361666bd832132346b3a1195d86ad479a9a17b5.tar.gz meson-9361666bd832132346b3a1195d86ad479a9a17b5.tar.bz2 | |
Merge pull request #2236 from trhd/env
Fix a stack trace caused by environment variables in test setups.
Diffstat (limited to 'mesonbuild/interpreter.py')
| -rw-r--r-- | mesonbuild/interpreter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index d71ce1f..23f5907 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2335,7 +2335,7 @@ class Interpreter(InterpreterBase): else: if not isinstance(envlist, list): envlist = [envlist] - env = {} + env = EnvironmentVariablesHolder() for e in envlist: if '=' not in e: raise InterpreterException('Env var definition must be of type key=val.') @@ -2344,7 +2344,8 @@ class Interpreter(InterpreterBase): val = val.strip() if ' ' in k: raise InterpreterException('Env var key must not have spaces in it.') - env[k] = val + env.add_var(env.held_object.set, [k, val], kwargs) + env = env.held_object return env def add_test(self, node, args, kwargs, is_base_test): |