diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-02-22 08:38:54 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-02-23 07:20:49 +0100 |
| commit | b1f6d53bc442de3fac52462bcfdf07900a89d241 (patch) | |
| tree | 41df987ccc03341872f813ae9725bcb5ba92795f /src/tests | |
| parent | 8f62c76c0a7590535c87e6095af419e5c9dbc8c1 (diff) | |
| download | NetworkManager-b1f6d53bc442de3fac52462bcfdf07900a89d241.tar.gz | |
build/meson: increase timeouts for some tests
The defaults for test timeouts in meson is 30 seconds. That is not long
enough when running
$ NMTST_USE_VALGRIND=1 ninja -C build test
Note that meson supports --timeout-multiplier, and automatically
increases the timeout when running under valgrind. However, meson
does not understand that we are running tests under valgrind via
NMTST_USE_VALGRIND=1 environment variable.
Timeouts are really not expected to be reached and are a mean of last
resort. Hence, increasing the timeout to a large value is likely to
have no effect or to fix test failures where the timeout was too rigid.
It's unlikely that the test indeed hangs and the increase of timeout
causes a unnecessary increase of waittime before aborting.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/config/meson.build | 1 | ||||
| -rw-r--r-- | src/tests/meson.build | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/tests/config/meson.build b/src/tests/config/meson.build index dc0a022cf4..f65f90bb80 100644 --- a/src/tests/config/meson.build +++ b/src/tests/config/meson.build @@ -17,4 +17,5 @@ test( 'config/' + test_unit, test_script, args: test_args + [exe.full_path()], + timeout: default_test_timeout, ) diff --git a/src/tests/meson.build b/src/tests/meson.build index 9c51e8d423..153128f237 100644 --- a/src/tests/meson.build +++ b/src/tests/meson.build @@ -21,6 +21,7 @@ foreach test_unit: test_units 'src/' + test_unit, test_script, args: test_args + [exe.full_path()], + timeout: default_test_timeout, ) endforeach |