From: Simon McVittie <smcv@collabora.com>
Date: Tue, 10 Dec 2024 11:00:28 +0000 (+0000)
Subject: bus: Update a build system cross-reference
X-Git-Tag: dbus-1.15.92~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=25656917627f1794efb147dd1a68e01185c85e9d;p=thirdparty%2Fdbus.git

bus: Update a build system cross-reference

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>
(cherry picked from commit 229e48f549dfb1af891545fd978974dd462777da)
---

diff --git a/bus/config-parser.c b/bus/config-parser.c
index 2b630d181..cb388473e 100644
--- a/bus/config-parser.c
+++ b/bus/config-parser.c
@@ -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");
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 032ba1f7e..f3fd8d9cd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -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)