summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@gnome.org>2018-08-11 23:48:14 +0100
committerDaniel Playfair Cal <daniel.playfair.cal@gmail.com>2018-08-12 14:34:34 +1000
commit25667413a2b09ee2bc35f3e1e0cca4e475b07b2e (patch)
treeb380613cbe648f8ffc183d3844488264438a185a
parent6ab2d5598403fe7afd6fe008c5b21e8b26080103 (diff)
downloaddconf-testing/add-service-cradle.tar.gz
Service: Add test cradle and basic teststesting/add-service-cradle
Signed-off-by: Philip Withnall <withnall@endlessm.com>
-rw-r--r--service/meson.build14
-rw-r--r--tests/meson.build2
2 files changed, 16 insertions, 0 deletions
diff --git a/service/meson.build b/service/meson.build
index 618cbd5..472b425 100644
--- a/service/meson.build
+++ b/service/meson.build
@@ -43,3 +43,17 @@ executable(
install: true,
install_dir: dconf_libexecdir,
)
+
+libdconf_service = static_library(
+ 'dconf-service',
+ sources,
+ include_directories: top_inc,
+ dependencies: service_deps,
+ c_args: '-DG_LOG_DOMAIN="dconf"',
+ pic: true,
+)
+
+libdconf_service_dep = declare_dependency(
+ dependencies: service_deps,
+ link_with: libdconf_service,
+)
diff --git a/tests/meson.build b/tests/meson.build
index ef0b940..54ea3b5 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -30,6 +30,7 @@ unit_tests = [
['gdbus-filter', 'dbus.c', '-DDBUS_BACKEND="/gdbus/filter"', libdconf_gdbus_filter_dep, []],
['engine', 'engine.c', '-DSRCDIR="@0@"'.format(test_dir), [dl_dep, libdconf_engine_dep, m_dep], libdconf_mock],
['client', 'client.c', '-DSRCDIR="@0@"'.format(test_dir), [libdconf_client_dep, libdconf_engine_dep], libdconf_mock],
+ ['writer', 'writer.c', '-DSRCDIR="@0@"'.format(test_dir), [libdconf_service_dep, dl_dep, m_dep], libdconf_mock],
]
foreach unit_test: unit_tests
@@ -39,6 +40,7 @@ foreach unit_test: unit_tests
c_args: unit_test[2],
dependencies: unit_test[3],
link_with: unit_test[4],
+ include_directories: [top_inc, include_directories('../service')],
)
test(unit_test[0], exe, is_parallel: false, env: envs)