1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
https://gitlab.gnome.org/GNOME/libsecret/-/merge_requests/162
From 219c3f3c48bd5af7ae9305a769a3b06a72929369 Mon Sep 17 00:00:00 2001
From: Niels De Graef <nielsdegraef@gmail.com>
Date: Sun, 26 Jan 2025 23:45:31 +0100
Subject: [PATCH] meson: Put test setup behind a feature option
This should allow the following cases:
- In case of "auto" (the default): meson will check if the necessary
binaries are installed (such as `dbus-run-session`) on the system and
fall back.
- In case of "enabled": meson will require the necessary binaries to be
installed
- In case of "disabled": meson will not try to mark this as the default
test setup.
The first case was already the default, however, some systems have a
preconfigured test setup which they'd like to use instead. Allow them to
disable the default test setup in that case.
Fixes: https://gitlab.gnome.org/GNOME/libsecret/-/issues/101
--- a/meson.build
+++ b/meson.build
@@ -102,7 +102,7 @@ test_env = environment()
test_env.set('abs_top_builddir', meson.build_root())
# Most tests require a D-Bus session, so try to wrap automatically with dbus-run-session
-dbus_run_session = find_program('dbus-run-session', required: false)
+dbus_run_session = find_program('dbus-run-session', required: get_option('test_setup'))
if dbus_run_session.found()
add_test_setup('dbus',
exe_wrapper: dbus_run_session,
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -61,3 +61,8 @@ option('pam',
description: 'Build PAM module',
)
+option('test_setup',
+ type: 'feature',
+ value: 'auto',
+ description: 'Automatically setup a test environment when running tests',
+)
--
GitLab
|
