diff options
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mesontest.py b/mesontest.py index e334a46..bce4100 100755 --- a/mesontest.py +++ b/mesontest.py @@ -88,7 +88,7 @@ parser.add_argument('--setup', default=None, dest='setup', help='Which test setup to use.') parser.add_argument('args', nargs='*') -class TestRun(): +class TestRun: def __init__(self, res, returncode, should_fail, duration, stdo, stde, cmd, env): self.res = res @@ -217,7 +217,7 @@ class TestHarness: child_env.update(test.env) if len(test.extra_paths) > 0: - child_env['PATH'] = child_env['PATH'] + ';'.join([''] + test.extra_paths) + child_env['PATH'] += ';'.join([''] + test.extra_paths) setsid = None stdout = None @@ -333,12 +333,14 @@ TIMEOUT: %4d self.run_tests(tests) return self.fail_count + @staticmethod def split_suite_string(suite): if ':' in suite: return suite.split(':', 1) else: - return (suite, "") + return suite, "" + @staticmethod def test_in_suites(test, suites): for suite in suites: (prj_match, st_match) = TestHarness.split_suite_string(suite) @@ -398,7 +400,7 @@ TIMEOUT: %4d def open_log_files(self): if not self.options.logbase or self.options.verbose: - return (None, None, None, None) + return None, None, None, None logfile_base = os.path.join(self.options.wd, 'meson-logs', self.options.logbase) @@ -416,7 +418,7 @@ TIMEOUT: %4d logfile.write('Log of Meson test suite run on %s.\n\n' % datetime.datetime.now().isoformat()) - return (logfile, logfilename, jsonlogfile, jsonlogfilename) + return logfile, logfilename, jsonlogfile, jsonlogfilename def get_wrapper(self): wrap = [] |