diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-09-07 16:05:45 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-09-10 17:41:37 +0530 |
| commit | aff981a6b0362eeb4b51f9c6cd424f4233953976 (patch) | |
| tree | d93e11c204da3c167aa151235680c476d0bb050f /mesonbuild | |
| parent | 21e2315afd90e844963ca1c982ba70a4e001efaf (diff) | |
| download | meson-aff981a6b0362eeb4b51f9c6cd424f4233953976.zip meson-aff981a6b0362eeb4b51f9c6cd424f4233953976.tar.gz meson-aff981a6b0362eeb4b51f9c6cd424f4233953976.tar.bz2 | |
Fix regression in test definitions
Caused by #2236. Also add a test for this.
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/interpreter.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 23f5907..2bcf198 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -2335,6 +2335,7 @@ class Interpreter(InterpreterBase): else: if not isinstance(envlist, list): envlist = [envlist] + # Convert from array to environment object env = EnvironmentVariablesHolder() for e in envlist: if '=' not in e: @@ -2344,7 +2345,7 @@ class Interpreter(InterpreterBase): val = val.strip() if ' ' in k: raise InterpreterException('Env var key must not have spaces in it.') - env.add_var(env.held_object.set, [k, val], kwargs) + env.set_method([k, val], {}) env = env.held_object return env |