meson: specify a timeout of 90 s for tests which take a bit longer

Both test-hashmap and test-benchmark need 10-11 s here, but might time out
under load with the default meson timeout of 30 s.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-04-12 13:08:47 -04:00
parent 8191c5948b
commit 81efcc1c89
2 changed files with 12 additions and 3 deletions

View File

@ -2075,8 +2075,13 @@ foreach tuple : tests
type = tuple.length() >= 5 ? tuple[4] : ''
defs = tuple.length() >= 6 ? tuple[5] : []
incs = tuple.length() >= 7 ? tuple[6] : includes
timeout = 30
name = sources[0].split('/')[-1].split('.')[0]
if type.startswith('timeout=')
timeout = type.split('=')[1].to_int()
type = ''
endif
if condition == '' or conf.get(condition, 0) == 1
install = install_tests and type == ''
@ -2097,7 +2102,9 @@ foreach tuple : tests
elif type == 'unsafe' and want_tests != 'unsafe'
message('@0@ is an unsafe test'.format(name))
else
test(name, exe, env : test_env)
test(name, exe,
env : test_env,
timeout : timeout)
endif
else
message('Not compiling @0@ because @1@ is not true'.format(name, condition))

View File

@ -340,7 +340,8 @@ tests += [
'src/test/test-hashmap-plain.c',
test_hashmap_ordered_c],
[libshared],
[]],
[],
'', 'timeout=90'],
[['src/test/test-set.c'],
[libshared],
@ -698,7 +699,8 @@ tests += [
[libjournal_core,
libshared],
[liblz4,
libxz]],
libxz],
'', 'timeout=90'],
[['src/journal/test-audit-type.c'],
[libjournal_core,