aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@centricular.com>2017-02-19 05:46:36 +0530
committerNirbheek Chauhan <nirbheek@centricular.com>2017-02-19 23:13:32 +0530
commit06d615611bd21a33363a9a907c31f018bd3e057c (patch)
tree1aa4f0f392942ab16c39affd1683baa6a1b22533
parent5bf4338913bddebfe29508a796c92da5b4e1249e (diff)
downloadmeson-06d615611bd21a33363a9a907c31f018bd3e057c.zip
meson-06d615611bd21a33363a9a907c31f018bd3e057c.tar.gz
meson-06d615611bd21a33363a9a907c31f018bd3e057c.tar.bz2
mesontest: Use setup timeout multiplier if not specified
The setup's timeout multiplier will always be set, and it will default to 1.0, so just use that. Without this, the setup's timeout multiplier was always ignored.
-rwxr-xr-xmesontest.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesontest.py b/mesontest.py
index cf8376f..57c364b 100755
--- a/mesontest.py
+++ b/mesontest.py
@@ -83,7 +83,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.0,
+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.')
@@ -563,6 +563,8 @@ def run(args):
global_env = merge_suite_options(options)
else:
global_env = build.EnvironmentVariables()
+ if options.timeout_multiplier is None:
+ options.timeout_multiplier = 1
setattr(options, 'global_env', global_env)