diff options
Diffstat (limited to 'mesontest.py')
| -rwxr-xr-x | mesontest.py | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/mesontest.py b/mesontest.py index 9a59cd7..1921b8a 100755 --- a/mesontest.py +++ b/mesontest.py @@ -227,7 +227,10 @@ class TestHarness: cwd=test.workdir, preexec_fn=setsid) timed_out = False - timeout = test.timeout * self.options.timeout_multiplier + if test.timeout is None: + timeout = None + else: + timeout = test.timeout * self.options.timeout_multiplier try: (stdo, stde) = p.communicate(timeout=timeout) except subprocess.TimeoutExpired: @@ -424,7 +427,9 @@ class TestHarness: if len(t.cmd_args) > 0: wrap.append('--args') if self.options.repeat > 1: - wrap.append('-ex', 'run', '-ex', 'quit') + # The user wants to debug interactively, so no timeout. + t.timeout = None + wrap += ['-ex', 'run', '-ex', 'quit'] res = self.run_single_test(wrap, t) else: @@ -460,8 +465,8 @@ def run(args): return th.run_special() if not options.no_rebuild: if not th.rebuild_all(): - return -1 - elif len(options.args) == 0: + sys.exit(-1) + if len(options.args) == 0: return th.doit() return th.run_special() |