diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-09-12 00:57:29 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-12 00:57:29 +0300 |
| commit | e1fc17ef2a532d539678b9a9378bca59eda38a91 (patch) | |
| tree | 6cd294d82898dd942419e82b46cdcee9760914a5 /mesonbuild | |
| parent | b3c70f495b736ff4ebe4c5097df2a5da0ea1ab80 (diff) | |
| parent | 4a9c31025c685edc70ea1eb906ef5bdeb8b7b973 (diff) | |
| download | meson-e1fc17ef2a532d539678b9a9378bca59eda38a91.zip meson-e1fc17ef2a532d539678b9a9378bca59eda38a91.tar.gz meson-e1fc17ef2a532d539678b9a9378bca59eda38a91.tar.bz2 | |
Merge pull request #2288 from centricular/fix-test-regression
Fix regression in test definitions
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 |