summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIñigo Martínez <inigomartinez@gmail.com>2019-09-11 09:28:04 +0200
committerThomas Haller <thaller@redhat.com>2019-10-01 09:49:33 +0200
commit70da6993c878444cd3a95f81753594af87ea1793 (patch)
tree84ab23a908f10cf520a98b26305ac6fdb14b3a1b
parent4e85fdcdb77b050e4d02eedd76be0ef4404ca53e (diff)
downloadNetworkManager-70da6993c878444cd3a95f81753594af87ea1793.tar.gz
meson: Improve dispatcher test build file
Different objects used in the `test-dispatcher-envp` target have been grouped together. The dependency over the `libnm` library has been removed as it is unnecessary.
-rw-r--r--dispatcher/tests/meson.build26
1 files changed, 12 insertions, 14 deletions
diff --git a/dispatcher/tests/meson.build b/dispatcher/tests/meson.build
index d339455b59..83c915e585 100644
--- a/dispatcher/tests/meson.build
+++ b/dispatcher/tests/meson.build
@@ -1,23 +1,21 @@
test_unit = 'test-dispatcher-envp'
-incs = [
- dispatcher_inc,
- libnm_inc,
+deps = [
+ libnm_nm_default_dep,
+ libnm_utils_base_dep,
+]
+
+c_flags = [
+ '-DNETWORKMANAGER_COMPILATION_TEST',
+ '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
]
exe = executable(
test_unit,
- [ test_unit + '.c' ] + [ nmdbus_dispatcher_sources ],
- include_directories: incs,
- dependencies: [
- libnm_dep,
- libnm_nm_default_dep,
- libnm_utils_base_dep,
- ],
- c_args: [
- '-DNETWORKMANAGER_COMPILATION_TEST',
- '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
- ],
+ [test_unit + '.c', nmdbus_dispatcher_sources],
+ include_directories: dispatcher_inc,
+ dependencies: deps,
+ c_args: c_flags,
link_with: libnm_dispatcher_core,
)