summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2021-01-27 21:32:28 +0100
committerThomas Haller <thaller@redhat.com>2021-01-27 21:32:28 +0100
commit3abae51080a82cdd77d3cfc68dc9498eb35276a3 (patch)
tree6b81fde3105d4baaf80bed185baaee5a559b0b86
parent5d85d7c849ee77a6f7f4d42d9119397c6932ac7f (diff)
downloadNetworkManager-3abae51080a82cdd77d3cfc68dc9498eb35276a3.tar.gz
build/meson: drop special timeout for libnm test
A timeout for tests should not be reached anyway. It's only a fail-safe for not running indefinitely (and for meson not killing the test too early). We don't need to run test-libnm with a shorter timeout.
-rw-r--r--libnm/tests/meson.build20
1 files changed, 12 insertions, 8 deletions
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index d185540596..71dc83e706 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -1,16 +1,20 @@
# SPDX-License-Identifier: LGPL-2.1-or-later
test_units = [
- ['test-libnm', 30],
- ['test-nm-client', 90],
- ['test-remote-settings-client', 90],
- ['test-secret-agent', 90],
+ 'test-libnm',
+ 'test-nm-client',
+ 'test-remote-settings-client',
+ 'test-secret-agent',
]
foreach test_unit: test_units
exe = executable(
- test_unit[0],
- [test_unit[0] + '.c', nm_test_utils_impl_source, libnm_enum_sources[1]],
+ test_unit,
+ [
+ test_unit + '.c',
+ nm_test_utils_impl_source,
+ libnm_enum_sources[1],
+ ],
dependencies: [
libnm_core_dep,
libnm_nm_default_dep,
@@ -23,9 +27,9 @@ foreach test_unit: test_units
)
test(
- test_unit[0],
+ test_unit,
test_script,
- timeout: test_unit[1],
+ timeout: 90,
args: test_args + [exe.full_path()],
)
endforeach