diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-19 17:34:46 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-20 20:33:59 +0200 |
| commit | 3fc67f49515544d17f11bd0853195c96373880f2 (patch) | |
| tree | 84b3044b92be53520510c90c71ad1fb00fe56d6d /mesontest.py | |
| parent | 2b650834631e09eee8dffa68a2058769a651d6f7 (diff) | |
| download | meson-3fc67f49515544d17f11bd0853195c96373880f2.zip meson-3fc67f49515544d17f11bd0853195c96373880f2.tar.gz meson-3fc67f49515544d17f11bd0853195c96373880f2.tar.bz2 | |
Minimal fixes to make tests pass when cross compiling.
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesontest.py b/mesontest.py index cbfab6a..36f7334 100755 --- a/mesontest.py +++ b/mesontest.py @@ -132,7 +132,11 @@ def write_json_log(jsonlogfile, test_name, result): 'duration' : result.duration, 'returncode' : result.returncode, 'command' : result.cmd, - 'env' : result.env} + } + if isinstance(result.env, dict): + jresult['env'] = result.env + else: + jresult['env'] = result.env.get_env(os.environ) if result.stde: jresult['stderr'] = result.stde jsonlogfile.write(json.dumps(jresult) + '\n') |