From: Yu Watanabe Date: Fri, 11 Jul 2025 11:24:57 +0000 (+0900) Subject: test: drop unnecessary line continuation X-Git-Tag: v258-rc1~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2e9193fcf12ce384488e79b9adef8b870e1db4c;p=thirdparty%2Fsystemd.git test: drop unnecessary line continuation --- diff --git a/test/units/TEST-50-DISSECT.mountfsd.sh b/test/units/TEST-50-DISSECT.mountfsd.sh index 205fabec190..bdd9a773261 100755 --- a/test/units/TEST-50-DISSECT.mountfsd.sh +++ b/test/units/TEST-50-DISSECT.mountfsd.sh @@ -6,12 +6,12 @@ set -o pipefail # shellcheck source=test/units/util.sh . "$(dirname "$0")"/util.sh -if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || \ - [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] || \ - ! command -v mksquashfs || \ +if [[ ! -f /usr/lib/systemd/system/systemd-mountfsd.socket ]] || + [[ ! -f /usr/lib/systemd/system/systemd-nsresourced.socket ]] || + ! command -v mksquashfs || ! grep -q bpf /sys/kernel/security/lsm || - ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || \ - systemd-analyze compare-versions "$(uname -r)" lt 6.5 || \ + ! find /usr/lib* -name libbpf.so.1 2>/dev/null | grep . || + systemd-analyze compare-versions "$(uname -r)" lt 6.5 || systemd-analyze compare-versions "$(pkcheck --version | awk '{print $3}')" lt 124; then echo "Skipping mountfsd/nsresourced tests" exit 0 diff --git a/test/units/TEST-60-MOUNT-RATELIMIT.sh b/test/units/TEST-60-MOUNT-RATELIMIT.sh index fdef5999ef7..fef5e81473a 100755 --- a/test/units/TEST-60-MOUNT-RATELIMIT.sh +++ b/test/units/TEST-60-MOUNT-RATELIMIT.sh @@ -243,9 +243,9 @@ EOF sleep 1 - if [[ "$(systemctl is-failed tmp-hoge.mount)" == "failed" ]] || \ + if [[ "$(systemctl is-failed tmp-hoge.mount)" == "failed" ]] || journalctl --since="$since" -u tmp-hoge.mount -q --grep "but there is no mount"; then - exit 1 + exit 1 fi systemctl stop tmp-hoge.mount