diff options
| author | Hemmo Nieminen <hemmo.nieminen@iki.fi> | 2018-03-03 02:08:29 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-03 21:23:33 +0200 |
| commit | 275c737d571709f0653c24d18a3adb14bbd9cb2f (patch) | |
| tree | 3c58f3f3240e3690c322bde8844bd469e070e3e2 /mesonbuild/mtest.py | |
| parent | 3a4ac966d0b6e33b5f2d469180ededa80923f7f7 (diff) | |
| download | meson-275c737d571709f0653c24d18a3adb14bbd9cb2f.zip meson-275c737d571709f0653c24d18a3adb14bbd9cb2f.tar.gz meson-275c737d571709f0653c24d18a3adb14bbd9cb2f.tar.bz2 | |
Fix test setup's timeout_multiplier handling.
Diffstat (limited to 'mesonbuild/mtest.py')
| -rw-r--r-- | mesonbuild/mtest.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mesonbuild/mtest.py b/mesonbuild/mtest.py index d36bf28..85fe943 100644 --- a/mesonbuild/mtest.py +++ b/mesonbuild/mtest.py @@ -90,7 +90,7 @@ parser.add_argument('-v', '--verbose', default=False, action='store_true', help='Do not redirect stdout and stderr') parser.add_argument('-q', '--quiet', default=False, action='store_true', help='Produce less output to the terminal.') -parser.add_argument('-t', '--timeout-multiplier', type=float, default=1, +parser.add_argument('-t', '--timeout-multiplier', type=float, default=None, help='Define a multiplier for test timeout, for example ' ' when running tests in particular conditions they might take' ' more time to execute.') @@ -303,8 +303,10 @@ class TestHarness: kill_test = False if test.timeout is None: timeout = None - else: + elif test_opts.timeout_multiplier is not None: timeout = test.timeout * test_opts.timeout_multiplier + else: + timeout = test.timeout try: (stdo, stde) = p.communicate(timeout=timeout) except subprocess.TimeoutExpired: |