From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sun, 16 May 2021 13:57:55 +0000 (+0200)
Subject: meson: use conf configuration_data object to generate test-sysusers.sh
X-Git-Tag: v249-rc1~210^2~22
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=097c072d83cc7dbb2518ad37b66d95ece27abaa8;p=thirdparty%2Fsystemd.git

meson: use conf configuration_data object to generate test-sysusers.sh

I wanted to use jinja2 templating here too, but it's hard to get right:
custom_target() strips the executable bit by default (unlike configure_file
apparently). custom_target() has install_mode setting, but it was only added
in meson-0.47, so it can't be used while we support 0.46. And without the
executable bit the test is not invoked properly. For example, "root-unittests"
in the debian package calls test-* after installation, so the executable bit
there is necessary. It would be possible to adjust the file mode after the
fact, but it would make things more complicated.

So let's use the native meson substitutions here. We don't need anything more
fancy.
---

diff --git a/test/meson.build b/test/meson.build
index b1d5bf9a852..47c7f4d49a5 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -65,7 +65,7 @@ hwdb_test_sh = find_program('hwdb-test.sh')
 test_sysusers_sh = configure_file(
         input : 'test-sysusers.sh.in',
         output : 'test-sysusers.sh',
-        configuration : substs)
+        configuration : conf)
 if install_tests and conf.get('ENABLE_SYSUSERS') == 1
         install_data(test_sysusers_sh,
                      install_dir : testsdir)