Merge remote-tracking branch 'salsa/upstream' into upstream

1 files changed, 12 insertions, 14 deletions

diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
index 0571efac..bedc6916 100644
--- a/src/platform/tests/meson.build
+++ b/src/platform/tests/meson.build
@@ -1,28 +1,27 @@
 test_units = [
-  ['test-link-fake', 'test-link.c', 60],
-  ['test-link-linux', 'test-link.c', 60],
-  ['test-address-fake', 'test-address.c'],
-  ['test-address-linux', 'test-address.c'],
-  ['test-general', 'test-general.c'],
-  ['test-nmp-object', 'test-nmp-object.c'],
-  ['test-route-fake', 'test-route.c'],
-  ['test-route-linux', 'test-route.c'],
-  ['test-cleanup-fake', 'test-cleanup.c'],
-  ['test-cleanup-linux', 'test-cleanup.c'],
+  ['test-link-fake',     'test-link.c',       test_nm_dep_fake,  30],
+  ['test-link-linux',    'test-link.c',       test_nm_dep_linux, 180],
+  ['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],
 ]
 
 foreach test_unit: test_units
   exe = executable(
     'platform-' + test_unit[0],
     test_unit[1],
-    dependencies: test_nm_dep,
-    c_args: test_cflags_platform
+    dependencies: test_unit[2],
   )
 
   test(
     'platform/' + test_unit[0],
     test_script,
-    timeout: test_unit.length() > 2 ? test_unit[2] : 30,
+    timeout: test_unit[3],
     args: test_args + [exe.full_path()]
   )
 endforeach
@@ -33,5 +32,4 @@ executable(
   test,
   test + '.c',
   dependencies: test_nm_dep,
-  c_args: test_cflags_platform
 )