fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 16:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bus: Update a build system cross-reference

Browse source 
We no longer have an Autotools build system, but Meson sets the same
environment variables that Autotools used to set. CMake does not, yet,
but ideally should.

Resolves: https://gitlab.freedesktop.org/dbus/dbus/-/issues/538
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2024-12-10 11:00:28 +00:00
parent 12265328a6
commit 229e48f549
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/config-parser.c
View file

@ -3815,7 +3815,7 @@ test_default_session_servicedirs (const DBusString *test_base_dir)
{
_dbus_test_diag ("Not testing default session service directories because a "
"build-time testing environment variable is not set: "
"see AM_TESTS_ENVIRONMENT in tests/Makefile.am");
"see test_env in tests/meson.build");
ret = TRUE;
goto out;
}
@ -3835,7 +3835,7 @@ test_default_session_servicedirs (const DBusString *test_base_dir)
if (!_dbus_string_append (&runtime_dir_based, "/dbus-1/services"))
_dbus_test_fatal ("out of memory");
/* Sanity check: the Makefile sets this up. We assume that if this is
/* The Meson build system sets this up. We assume that if this is
* right, the XDG_DATA_DIRS will be too. */
if (!_dbus_string_starts_with_c_str (&data_home_based, dbus_test_builddir))
_dbus_test_fatal ("$XDG_DATA_HOME should start with $DBUS_TEST_BUILDDIR");

3
test/CMakeLists.txt
View file

@ -149,6 +149,9 @@ if(DBUS_ENABLE_INTRUSIVE_TESTS)
set(SOURCES bus/main.c bus/common.c bus/common.h)
add_test_executable(test-bus "${SOURCES}" dbus-daemon-internal dbus-testutils ${EXPAT_LIBRARIES})
# TODO: For full coverage this should be run with some specific
# environment variable values: see test_env in tests/meson.build,
# and dbus#538
set_target_properties(test-bus PROPERTIES COMPILE_FLAGS ${DBUS_INTERNAL_CLIENT_DEFINITIONS})
if(ENABLE_TRADITIONAL_ACTIVATION)