report: install systemd-report binary to /usr/lib/systemd/ for now

The tool should not be considered stable, and those things we usually
place in /usr/lib/systemd, and not in $PATH.

We can move that to $PATH once we are confident it's gonna stay the way
it is.

diff --git a/src/report/meson.build b/src/report/meson.build
index ab1ac45acce86ef6882211b955ed6b4ca171542b..2813f9d033b1640976e57b538771546ec925e567 100644 (file)
--- a/src/report/meson.build
+++ b/src/report/meson.build
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 executables += [
-        executable_template + {
+        libexec_template + {
                 'name' : 'systemd-report',
                 'public' : true,
                 'sources' : files('report.c'),

diff --git a/test/units/TEST-74-AUX-UTILS.report.sh b/test/units/TEST-74-AUX-UTILS.report.sh
index 3e1f2af114581e46c7617c49a774eab70cc4e085..876c5b2cad49eb2680b450764b7f621512d4743b 100755 (executable)
--- a/test/units/TEST-74-AUX-UTILS.report.sh
+++ b/test/units/TEST-74-AUX-UTILS.report.sh
@@ -6,27 +6,29 @@ set -o pipefail
 # Unset $PAGER so we don't have to use --no-pager everywhere
 export PAGER=
 
-systemd-report --help
-systemd-report help
-systemd-report --version
-systemd-report --json=help
+REPORT=/usr/lib/systemd/systemd-report
 
-systemd-report metrics
-systemd-report metrics -j
-systemd-report metrics --no-legend
-systemd-report describe-metrics
-systemd-report describe-metrics -j
-systemd-report describe-metrics --no-legend
-systemd-report list-sources
-systemd-report list-sources -j
-systemd-report list-sources --no-legend
+"$REPORT" --help
+"$REPORT" help
+"$REPORT" --version
+"$REPORT" --json=help
 
-systemd-report metrics io
-systemd-report metrics io.systemd piff
-systemd-report metrics piff
-systemd-report describe-metrics io
-systemd-report describe-metrics io.systemd piff
-systemd-report describe-metrics piff
+"$REPORT" metrics
+"$REPORT" metrics -j
+"$REPORT" metrics --no-legend
+"$REPORT" describe-metrics
+"$REPORT" describe-metrics -j
+"$REPORT" describe-metrics --no-legend
+"$REPORT" list-sources
+"$REPORT" list-sources -j
+"$REPORT" list-sources --no-legend
+
+"$REPORT" metrics io
+"$REPORT" metrics io.systemd piff
+"$REPORT" metrics piff
+"$REPORT" describe-metrics io
+"$REPORT" describe-metrics io.systemd piff
+"$REPORT" describe-metrics piff
 
 # test io.systemd.Network Metrics
 varlinkctl info /run/systemd/report/io.systemd.Network