diff options
author | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-10 19:21:53 +0200 |
---|---|---|
committer | Jussi Pakkanen <jpakkane@gmail.com> | 2016-12-11 14:20:39 +0200 |
commit | 22aedda6d05ebc7bea48fdee4a28b9104f50eeed (patch) | |
tree | 97c98a42d1e0844536ac5a8ad1e18a9baca8c1ef /mesontest.py | |
parent | 60716fcd6debd9f1ebca0091c945df16a3bd3715 (diff) | |
download | meson-22aedda6d05ebc7bea48fdee4a28b9104f50eeed.tar.gz |
Use a big timeout when running gdb interactively and a typo fix.
Diffstat (limited to 'mesontest.py')
-rwxr-xr-x | mesontest.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mesontest.py b/mesontest.py index 9a59cd71e..730730bb0 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: |