diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-20 21:23:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 21:23:56 +0200 |
| commit | c7685e8ab3642a14e9d962e420bf2b8c7e7f28fa (patch) | |
| tree | d00b92c38729bd2afe3ee2343216deda89ec9b22 /mesontest.py | |
| parent | 4317edca25a29a191c51c520e2861f6d45f7b6b1 (diff) | |
| parent | 701e3932619779a57f95732d61189d47e34dcb88 (diff) | |
| download | meson-c7685e8ab3642a14e9d962e420bf2b8c7e7f28fa.zip meson-c7685e8ab3642a14e9d962e420bf2b8c7e7f28fa.tar.gz meson-c7685e8ab3642a14e9d962e420bf2b8c7e7f28fa.tar.bz2 | |
Merge pull request #1228 from mesonbuild/runcross
Fix cross test and run them if a cross compiler is available.
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mesontest.py b/mesontest.py index 1921b8a..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') @@ -198,7 +202,7 @@ class TestHarness: duration = 0.0 stdo = 'Not run because can not execute cross compiled binaries.' stde = None - returncode = -1 + returncode = GNU_SKIP_RETURNCODE else: cmd = wrap + cmd + test.cmd_args starttime = time.time() |