mirror of
https://gitlab.gnome.org/GNOME/libsecret.git
synced 2025-01-19 02:28:37 +00:00
Merge branch 'nielsdg/make-dbus-run-session-optional' into 'main'
meson: Make dbus-run-session optional Closes #100 See merge request GNOME/libsecret!157
This commit is contained in:
commit
6603088bf1
13
meson.build
13
meson.build
@ -101,11 +101,16 @@ configure_file(output: 'config.h', configuration: conf)
|
|||||||
test_env = environment()
|
test_env = environment()
|
||||||
test_env.set('abs_top_builddir', meson.build_root())
|
test_env.set('abs_top_builddir', meson.build_root())
|
||||||
|
|
||||||
# Most tests require a D-Bus session
|
# Most tests require a D-Bus session, so try to wrap automatically with dbus-run-session
|
||||||
add_test_setup('dbus',
|
dbus_run_session = find_program('dbus-run-session', required: false)
|
||||||
exe_wrapper: find_program('dbus-run-session'),
|
if dbus_run_session.found()
|
||||||
|
add_test_setup('dbus',
|
||||||
|
exe_wrapper: dbus_run_session,
|
||||||
is_default: true,
|
is_default: true,
|
||||||
)
|
)
|
||||||
|
else
|
||||||
|
message('dbus-run-session not found. Please note that tests might fail if you don\'t set up a D-Bus session.')
|
||||||
|
endif
|
||||||
|
|
||||||
# Subfolders
|
# Subfolders
|
||||||
subdir('po')
|
subdir('po')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user