about summary refs log tree commit diff
path: root/libnm/tests/meson.build
diff options
context:
space:
mode:
authorSebastien Bacher <seb128@ubuntu.com>2019-01-25 10:52:15 +0100
committerSebastien Bacher <seb128@ubuntu.com>2019-01-25 11:24:27 +0100
commite8ac7dacdcf4b38addef4f8ac6ab038f9d29582c (patch)
tree017883e210043859ee695250f6285380b795f8e4 /libnm/tests/meson.build
parentb05c072fe2594e0369cbfb00a3fba176d2d309dc (diff)
parent1b878e595ff7be634a4800ca6cc506046e49548e (diff)
Merge remote-tracking branch 'salsa/master' into disco
Diffstat (limited to 'libnm/tests/meson.build')
-rw-r--r--libnm/tests/meson.build11
1 files changed, 6 insertions, 5 deletions
diff --git a/libnm/tests/meson.build b/libnm/tests/meson.build
index e2b88273..ae2f7124 100644
--- a/libnm/tests/meson.build
+++ b/libnm/tests/meson.build
@@ -1,14 +1,14 @@
 test_units = [
-  ['test-general',                [libnm_utils, libnm_core]],
-  ['test-nm-client',              []],
-  ['test-remote-settings-client', []],
-  ['test-secret-agent',           []],
+  ['test-general',                [libnm_utils, libnm_core], 30],
+  ['test-nm-client',              [],                        90],
+  ['test-remote-settings-client', [],                        90],
+  ['test-secret-agent',           [],                        90],
 ]
 
 cflags = [
   '-DNETWORKMANAGER_COMPILATION_TEST',
   '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
-] + nm_build_cflags
+]
 
 foreach test_unit: test_units
   exe = executable(
@@ -28,6 +28,7 @@ foreach test_unit: test_units
   test(
     'libnm/' + test_unit[0],
     test_script,
+    timeout: test_unit[2],
     args: test_args + [exe.full_path()]
   )
 endforeach