tests: don't hardcode systemctl path

Get it from type -P instead, to support --enable-split-usr.

diff --git a/Makefile.am b/Makefile.am
index 2b980b45f0dfcefc641922ee99e00c24e35bb789..14f682755ac2a0209aade804af8b88e4626b925f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1433,7 +1433,7 @@ EXTRA_DIST += \
        test/c.service \
        test/daughter.service \
        test/d.service \
-       test/end.service \
+       test/end.service.in \
        test/e.service \
        test/f.service \
        test/grandchild.service \

diff --git a/test/end.service b/test/end.service.in
similarity index 57%
rename from test/end.service
rename to test/end.service.in
index 0f04dfeb2032ab72659fa7e1681eedb2e9037881..4857ffe02bc3ba970ecd6aa6ee333a7f39477d7f 100644 (file)
--- a/test/end.service
+++ b/test/end.service.in
@@ -3,4 +3,4 @@ Description=End the test
 After=testsuite.service
 
 [Service]
-ExecStart=/usr/bin/systemctl poweroff --no-block
+ExecStart=@SYSTEMCTL@ poweroff --no-block

diff --git a/test/test-functions b/test/test-functions
index a0f1bf4eb2a3ca27bedc591cd68c58b4e9aeb68a..42c954d5658fe18773c9fbe673d0c623ed461bc5 100644 (file)
--- a/test/test-functions
+++ b/test/test-functions
@@ -293,7 +293,8 @@ install_terminfo() {
 }
 
 setup_testsuite() {
-    cp $TEST_BASE_DIR/{testsuite.target,end.service} $initdir/etc/systemd/system/
+    cp $TEST_BASE_DIR/testsuite.target $initdir/etc/systemd/system/
+    sed "s#@SYSTEMCTL@#$(type -P systemctl)#g" $TEST_BASE_DIR/end.service.in > $initdir/etc/systemd/system/end.service
 
     mkdir -p $initdir/etc/systemd/system/testsuite.target.wants
     ln -fs $TEST_BASE_DIR/testsuite.service $initdir/etc/systemd/system/testsuite.target.wants/testsuite.service