From: Jan Janssen <medhefgo@web.de>
Date: Tue, 11 Jan 2022 10:27:27 +0000 (+0100)
Subject: meson: Use echo to list files
X-Git-Tag: v251-rc1~549^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F22088%2Fhead;p=thirdparty%2Fsystemd.git

meson: Use echo to list files

No need to invoke ls when we are just interested in file names.
Also, the cd to source root makes the output identical to
"git ls-files" (relative instead of absolute paths).
---

diff --git a/test/fuzz/meson.build b/test/fuzz/meson.build
index e8e17446e05..c0720b14ea1 100644
--- a/test/fuzz/meson.build
+++ b/test/fuzz/meson.build
@@ -22,7 +22,7 @@ if git.found() and fs.exists(project_source_root / '.git')
                           'ls-files', ':/test/fuzz/*/*',
                           check: true)
 else
-        out = run_command(sh, '-c', 'ls @0@/test/fuzz/*/*'.format(project_source_root), check: true)
+        out = run_command(sh, '-c', 'cd "@0@"; echo test/fuzz/*/*'.format(project_source_root), check: true)
 endif
 
 fuzz_regression_tests = []
diff --git a/test/meson.build b/test/meson.build
index 46eab4c1e14..6f6bba69946 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -174,7 +174,7 @@ if want_tests != 'false' and dmi_arches.contains(host_machine.cpu_family())
                         check: true)
         else
                 out = run_command(
-                        sh, '-c', 'ls @0@/test/dmidecode-dumps/*.bin'.format(project_source_root),
+                        sh, '-c', 'cd "@0@"; echo test/dmidecode-dumps/*.bin'.format(project_source_root),
                         check: true)
         endif