diff options
author | Frantisek Sumsal <frantisek@sumsal.cz> | 2019-01-18 20:49:29 +0100 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2019-01-21 11:35:24 +0100 |
commit | e4e039bce4462b45e413bb687ab593b6ecc886e3 (patch) | |
tree | 0fa613502c455976186b90232611e252b31b3683 /test | |
parent | NEWS: add section about backslashes in EnvironmentFile (diff) | |
download | systemd-e4e039bce4462b45e413bb687ab593b6ecc886e3.tar.xz systemd-e4e039bce4462b45e413bb687ab593b6ecc886e3.zip |
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.
Diffstat (limited to 'test')
-rw-r--r-- | test/test-functions | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/test/test-functions b/test/test-functions index 498dc82b18..a8c7949668 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 ) } |