From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 28 Jun 2025 13:10:00 +0000 (+0200)
Subject: meson: quote paths in generated systemd-runtest.env
X-Git-Tag: v258-rc1~223^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a580dee6bb6c63d587527fc630f1642deea99b5;p=thirdparty%2Fsystemd.git

meson: quote paths in generated systemd-runtest.env

Looking at aecb6eaed7d39d73f296c86a882c644b18b7e634, it seems that we
want build paths with spaces to be supported. Let's use 'printf %q' here
to make that work. Also, use capture:true to make the command less complicated.
---

diff --git a/meson.build b/meson.build
index 0c2cb66fc32..5ef61010fa6 100644
--- a/meson.build
+++ b/meson.build
@@ -2145,10 +2145,11 @@ endif
 runtest_env = custom_target(
         'systemd-runtest.env',
         output : 'systemd-runtest.env',
-        command : [sh, '-c',
-                   '{ echo SYSTEMD_TEST_DATA=@0@; echo SYSTEMD_CATALOG_DIR=@1@; } >@OUTPUT@'.format(
-                           meson.project_source_root() / 'test',
-                           meson.project_build_root() / 'catalog')],
+        command : ['printf',
+                   'SYSTEMD_TEST_DATA=%q\nSYSTEMD_CATALOG_DIR=%q\n',
+                   meson.project_source_root() / 'test',
+                   meson.project_build_root() / 'catalog'],
+        capture: true,
         depends : catalogs,
         build_by_default : true)