From a7e579cd7b46d4da3b3b271ecbf0e0eff98b7c3f Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksander@aleksander.es>
Date: Tue, 15 Feb 2022 23:13:53 +0100
Subject: [PATCH] meson,data: generate test service file

The test service file is used in the test-plugin-generic unit tests,
which require the ModemManager daemon to be launched in a private test
DBus session.
---
 configure.ac                                        |  6 ++++++
 data/meson.build                                    |  2 ++
 data/tests/meson.build                              | 13 +++++++++++++
 data/tests/org.freedesktop.ModemManager1.service.in |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 data/tests/meson.build

diff --git a/configure.ac b/configure.ac
index b4c14804..6ffa5128 100644
--- a/configure.ac
+++ b/configure.ac
@@ -221,6 +221,12 @@ if test "x$with_systemdsystemunitdir" != xno; then
 fi
 AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$SYSTEMD_UNIT_DIR" -a "$SYSTEMD_UNIT_DIR" != xno ])
 
+
+dnl subdir where plugins are built w.r.t abs_top_builddir, just because it's
+dnl different to what meson does
+PLUGIN_BUILD_SUBDIR="plugins/.libs"
+AC_SUBST(PLUGIN_BUILD_SUBDIR)
+
 dnl-----------------------------------------------------------------------------
 dnl udev support (enabled by default)
 dnl
diff --git a/data/meson.build b/data/meson.build
index 820bec71..d2a36b7e 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,6 +1,8 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2021 Iñigo Martinez <inigomartinez@gmail.com>
 
+subdir('tests')
+
 service_conf = {
   'sbindir': mm_prefix / mm_sbindir,
   'MM_POLKIT_SERVICE': (enable_polkit ? 'polkit.service' : ''),
diff --git a/data/tests/meson.build b/data/tests/meson.build
new file mode 100644
index 00000000..fa0b2c00
--- /dev/null
+++ b/data/tests/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+# Copyright (C) 2022 Aleksander Morgado <aleksander@aleksander.es>
+
+test_conf = {
+  'abs_top_builddir': build_root,
+  'PLUGIN_BUILD_SUBDIR': 'plugins/',
+}
+
+configure_file(
+  input: 'org.freedesktop.ModemManager1.service.in',
+  output: '@BASENAME@',
+  configuration: test_conf,
+)
\ No newline at end of file
diff --git a/data/tests/org.freedesktop.ModemManager1.service.in b/data/tests/org.freedesktop.ModemManager1.service.in
index d7c1a007..d8a751b4 100644
--- a/data/tests/org.freedesktop.ModemManager1.service.in
+++ b/data/tests/org.freedesktop.ModemManager1.service.in
@@ -2,4 +2,4 @@
 
 [D-BUS Service]
 Name=org.freedesktop.ModemManager1
-Exec=@abs_top_builddir@/src/ModemManager --test-session --no-auto-scan --test-enable --test-plugin-dir="@abs_top_builddir@/plugins/.libs" --debug
+Exec=@abs_top_builddir@/src/ModemManager --test-session --no-auto-scan --test-enable --test-plugin-dir="@abs_top_builddir@/@PLUGIN_BUILD_SUBDIR@" --debug