From 2b650834631e09eee8dffa68a2058769a651d6f7 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 19 Dec 2016 13:48:26 +0200 Subject: Fix cross test and run them if a cross compiler is available. --- mesontest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mesontest.py') diff --git a/mesontest.py b/mesontest.py index 1921b8a..cbfab6a 100755 --- a/mesontest.py +++ b/mesontest.py @@ -198,7 +198,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() -- cgit v1.1 From 3fc67f49515544d17f11bd0853195c96373880f2 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Mon, 19 Dec 2016 17:34:46 +0200 Subject: Minimal fixes to make tests pass when cross compiling. --- mesontest.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'mesontest.py') 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') -- cgit v1.1