diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2017-02-20 14:56:45 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-20 14:56:45 -0500 |
commit | d6614ba811e18e1b0f0d0cab502a7c770ee499c8 (patch) | |
tree | 7799f8abaa453c7df72c59fcf96f2324f13adbef /mesonbuild/interpreter.py | |
parent | 98af711ca6f166bacf2b9c6e697026f5b323827a (diff) | |
parent | f90f17b25089ac173929c955e35956d19f3a5e2a (diff) | |
download | meson-d6614ba811e18e1b0f0d0cab502a7c770ee499c8.zip meson-d6614ba811e18e1b0f0d0cab502a7c770ee499c8.tar.gz meson-d6614ba811e18e1b0f0d0cab502a7c770ee499c8.tar.bz2 |
Merge pull request #1402 from centricular/test-setup-fixes
Various fixes to how mesontest handles test setups.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r-- | mesonbuild/interpreter.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 0d252fd..07b5c40 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -134,6 +134,10 @@ class EnvironmentVariablesHolder(MutableInterpreterObject): 'prepend': self.prepend_method, }) + def __repr__(self): + repr_str = "<{0}: {1}>" + return repr_str.format(self.__class__.__name__, self.held_object.envvars) + @stringArgs def add_var(self, method, args, kwargs): if not isinstance(kwargs.get("separator", ""), str): @@ -2056,7 +2060,7 @@ requirements use the version keyword argument instead.''') self.add_test(node, args, kwargs, True) def unpack_env_kwarg(self, kwargs): - envlist = kwargs.get('env', []) + envlist = kwargs.get('env', EnvironmentVariablesHolder()) if isinstance(envlist, EnvironmentVariablesHolder): env = envlist.held_object else: |