diff options
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/mesontest.py b/mesontest.py index 28440e0..ecf1b41 100755 --- a/mesontest.py +++ b/mesontest.py @@ -101,7 +101,7 @@ class TestRun(): if self.cmd is None: res += 'NONE\n' else: - res += "\n%s %s\n" %(' '.join( + res += "\n%s %s\n" % (' '.join( ["%s='%s'" % (k, v) for k, v in self.env.items()]), ' ' .join(self.cmd)) if self.stdo: @@ -131,8 +131,7 @@ def write_json_log(jsonlogfile, test_name, result): 'result': result.res, 'duration': result.duration, 'returncode': result.returncode, - 'command': result.cmd, - } + 'command': result.cmd} if isinstance(result.env, dict): jresult['env'] = result.env else: @@ -274,10 +273,10 @@ class TestHarness: return result def print_stats(self, numlen, tests, name, result, i, logfile, jsonlogfile): - startpad = ' '*(numlen - len('%d' % (i+1))) - num = '%s%d/%d' % (startpad, i+1, len(tests)) - padding1 = ' '*(38-len(name)) - padding2 = ' '*(8-len(result.res)) + startpad = ' ' * (numlen - len('%d' % (i + 1))) + num = '%s%d/%d' % (startpad, i + 1, len(tests)) + padding1 = ' ' * (38 - len(name)) + padding2 = ' ' * (8 - len(result.res)) result_str = '%s %s %s%s%s%5.2f s' % \ (num, name, padding1, result.res, padding2, result.duration) print(result_str) @@ -327,7 +326,7 @@ class TestHarness: if self.options.wrapper is None: wrap = [] logfilename = logfile_base + '.txt' - jsonlogfilename = logfile_base+ '.json' + jsonlogfilename = logfile_base + '.json' else: wrap = self.options.wrapper.split() namebase = wrap[0] @@ -346,10 +345,10 @@ class TestHarness: logfile = None try: if not self.options.verbose: - jsonlogfile = open(jsonlogfilename, 'w') + jsonlogfile = open(jsonlogfilename, 'w') logfile = open(logfilename, 'w') logfile.write('Log of Meson test suite run on %s.\n\n' % - datetime.datetime.now().isoformat()) + datetime.datetime.now().isoformat()) for i in range(self.options.repeat): for i, test in enumerate(filtered_tests): @@ -367,7 +366,7 @@ class TestHarness: res = self.run_single_test(wrap, test) if not self.options.verbose: self.print_stats(numlen, filtered_tests, visible_name, res, i, - logfile, jsonlogfile) + logfile, jsonlogfile) else: f = executor.submit(self.run_single_test, wrap, test) if not self.options.verbose: @@ -425,7 +424,7 @@ class TestHarness: for t in tests: if t.name in self.options.args: for i in range(self.options.repeat): - print('Running: %s %d/%d' % (t.name, i+1, self.options.repeat)) + print('Running: %s %d/%d' % (t.name, i + 1, self.options.repeat)) if self.options.gdb: wrap = ['gdb', '--quiet'] if len(t.cmd_args) > 0: |