New upstream version 1.22.0 upstream/1.22.0

1 files changed, 21 insertions, 14 deletions

diff --git a/src/platform/tests/meson.build b/src/platform/tests/meson.build
index aaee8964..6f7173b6 100644
--- a/src/platform/tests/meson.build
+++ b/src/platform/tests/meson.build
@@ -1,21 +1,25 @@
+test_fake_c_flags = test_c_flags + ['-DSETUP=nm_fake_platform_setup']
+test_linux_c_flags = test_c_flags + ['-DSETUP=nm_linux_platform_setup']
+
 test_units = [
-  [ '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-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 ],
-  [ '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-nmp-object',       'test-nmp-object.c',       test_nm_dep,       default_test_timeout ],
-  [ 'test-platform-general', 'test-platform-general.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-address-fake', 'test-address.c', test_fake_c_flags, default_test_timeout],
+  ['test-address-linux', 'test-address.c', test_linux_c_flags, default_test_timeout],
+  ['test-cleanup-fake', 'test-cleanup.c', test_fake_c_flags, default_test_timeout],
+  ['test-cleanup-linux', 'test-cleanup.c', test_linux_c_flags, default_test_timeout],
+  ['test-link-fake', 'test-link.c', test_fake_c_flags, default_test_timeout],
+  ['test-link-linux', 'test-link.c', test_linux_c_flags, 900],
+  ['test-nmp-object', 'test-nmp-object.c', test_c_flags, default_test_timeout],
+  ['test-platform-general', 'test-platform-general.c', test_c_flags, default_test_timeout],
+  ['test-route-fake', 'test-route.c', test_fake_c_flags, default_test_timeout],
+  ['test-route-linux', 'test-route.c', test_linux_c_flags, default_test_timeout],
 ]
 
 foreach test_unit: test_units
   exe = executable(
     test_unit[0],
     test_unit[1],
-    dependencies: test_unit[2],
+    dependencies: libnetwork_manager_test_dep,
+    c_args: test_unit[2],
   )
   test(
     'platform/' + test_unit[0],
@@ -25,8 +29,11 @@ foreach test_unit: test_units
   )
 endforeach
 
+name = 'monitor'
+
 executable(
-  'monitor',
-  'monitor.c',
-  dependencies: test_nm_dep,
+  name,
+  name + '.c',
+  dependencies: libnetwork_manager_test_dep,
+  c_args: test_c_flags,
 )