]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: drop unnecessary line continuation
authorYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 11 Jul 2025 11:24:57 +0000 (20:24 +0900)
committerLuca Boccassi <luca.boccassi@gmail.com>
Mon, 4 Aug 2025 15:03:37 +0000 (16:03 +0100)
(cherry picked from commit f2e9193fcf12ce384488e79b9adef8b870e1db4c)

test/units/TEST-50-DISSECT.mountfsd.sh
test/units/TEST-60-MOUNT-RATELIMIT.sh

index 0ab1a6107966304aed239db1728f6e6a87935793..e3e7e4c324c0d618d50998b0c2ff8565d377a28c 100755 (executable)
@@ -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
index 67d44c281a938433f5a0dd408a27ce4220c6739f..db15fa831dc44005de354d6f9340786ef7cf57b4 100755 (executable)
@@ -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