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.
This commit is contained in:
Thomas Haller 2019-02-22 08:38:54 +01:00
parent 8f62c76c0a
commit b1f6d53bc4
11 changed files with 21 additions and 10 deletions

View file

@ -47,5 +47,6 @@ foreach test_unit: test_units
'libnm-core/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)
endforeach

View file

@ -98,6 +98,8 @@ set_defines = [
['VERSION', nm_version],
]
default_test_timeout = 90
foreach define: set_defines
config_h.set_quoted(define[0], define[1])
endforeach

View file

@ -14,5 +14,6 @@ foreach test_unit: test_units
'devices/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)
endforeach

View file

@ -10,4 +10,5 @@ test(
'devices/wifi/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)

View file

@ -14,5 +14,6 @@ foreach test_unit: test_units
'dhcp/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)
endforeach

View file

@ -10,6 +10,7 @@ test(
'ndisc/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)
test = 'test-ndisc-linux'

View file

@ -1,14 +1,14 @@
test_units = [
['test-link-fake', 'test-link.c', test_nm_dep_fake, 30],
['test-link-linux', 'test-link.c', test_nm_dep_linux, 300],
['test-address-fake', 'test-address.c', test_nm_dep_fake, 30],
['test-address-linux', 'test-address.c', test_nm_dep_linux, 30],
['test-general', 'test-general.c', test_nm_dep, 30],
['test-nmp-object', 'test-nmp-object.c', test_nm_dep, 30],
['test-route-fake', 'test-route.c', test_nm_dep_fake, 30],
['test-route-linux', 'test-route.c', test_nm_dep_linux, 30],
['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, 30],
['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, 30],
['test-link-fake', 'test-link.c', test_nm_dep_fake, default_test_timeout],
['test-link-linux', 'test-link.c', test_nm_dep_linux, 900],
['test-address-fake', 'test-address.c', test_nm_dep_fake, default_test_timeout],
['test-address-linux', 'test-address.c', test_nm_dep_linux, default_test_timeout],
['test-general', 'test-general.c', test_nm_dep, default_test_timeout],
['test-nmp-object', 'test-nmp-object.c', test_nm_dep, default_test_timeout],
['test-route-fake', 'test-route.c', test_nm_dep_fake, default_test_timeout],
['test-route-linux', 'test-route.c', test_nm_dep_linux, default_test_timeout],
['test-cleanup-fake', 'test-cleanup.c', test_nm_dep_fake, default_test_timeout],
['test-cleanup-linux', 'test-cleanup.c', test_nm_dep_linux, default_test_timeout],
]
foreach test_unit: test_units

View file

@ -12,4 +12,5 @@ test(
'keyfile/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)

View file

@ -10,4 +10,5 @@ test(
'supplicant/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)

View file

@ -17,4 +17,5 @@ test(
'config/' + test_unit,
test_script,
args: test_args + [exe.full_path()],
timeout: default_test_timeout,
)

View file

@ -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