From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Fri, 18 Jan 2019 19:49:29 +0000 (+0100)
Subject: test: mark plymouth as optional dependency
X-Git-Tag: v241-rc1~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e4e039bce4462b45e413bb687ab593b6ecc886e3;p=thirdparty%2Fsystemd.git

test: mark plymouth as optional dependency

rescue.service pulls in /bin/plymouth, which doesn't exist on some
distributions (e.g. Arch Linux). Let's mark it as optional, as it's not
even required by the referencing unit and causes unwanted fails in the
integration testsuite.
---

diff --git a/test/test-functions b/test/test-functions
index 498dc82b18a..a8c79496682 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -551,7 +551,9 @@ install_execs() {
     sed -r -n 's|^Exec[a-zA-Z]*=[@+!-]*([^ ]+).*|\1|gp' $initdir/{$systemdsystemunitdir,$systemduserunitdir}/*.service \
          | sort -u | while read i; do
          # some {rc,halt}.local scripts and programs are okay to not exist, the rest should
-         inst $i || [ "${i%.local}" != "$i" ] || [ "${i%systemd-update-done}" != "$i" ]
+         # also, plymouth is pulled in by rescue.service, but even there the exit code
+         # is ignored; as it's not present on some distros, don't fail if it doesn't exist
+         inst $i || [ "${i%.local}" != "$i" ] || [ "${i%systemd-update-done}" != "$i" ] || [ "/bin/plymouth" == "$i" ]
      done
     )
 }