tests: fix remaining shellcheck warnings

 - fstab-devname: remove broken '|| >>' pattern (SC2188), the bare
   redirection after || has no command
 - fstab-all: quote $(basename ...) to prevent word splitting (SC2046)
 - libmount/lock, fsck/ismounted: use ':' no-op with bare file
   truncation redirections (SC2188)

Signed-off-by: Karel Zak <kzak@redhat.com>

diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index 6b6dd74358d76ff43fdc55273609da852bc759a3..716d7d60fb89c62d02a3e16d8a65db065f89c237 100755 (executable)
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -28,7 +28,7 @@ ts_skip_nonroot
 ts_check_losetup
 ts_check_prog "mkfs.ext2"
 
-> "$TS_OUTPUT"
+: > "$TS_OUTPUT"
 
 ts_device_init
 DEVICE=$TS_LODEV

diff --git a/tests/ts/libmount/lock b/tests/ts/libmount/lock
index f0567454527a0116bcf6bf89a7e6674f30b82856..d58bfa8bf9b4fb0f6d7f4ee08201db635caeda3a 100755 (executable)
--- a/tests/ts/libmount/lock
+++ b/tests/ts/libmount/lock
@@ -28,7 +28,7 @@ NLOOPS=1000
 NPROCESSES=50
 
 
-> "$TS_OUTPUT".debug
+: > "$TS_OUTPUT".debug
 echo 0 > "$TS_OUTPUT"
 SYNCTIME=$(( $(date +%s) + 5 ))
 

diff --git a/tests/ts/mount/fstab-all b/tests/ts/mount/fstab-all
index 7448557ae19f9e79a2a528656e340c1be1294c51..f00bc618ffae3e533860d803ae8a1bbb1dd4dfc4 100755 (executable)
--- a/tests/ts/mount/fstab-all
+++ b/tests/ts/mount/fstab-all
@@ -118,7 +118,7 @@ ts_finalize_subtest
 
 ts_init_subtest "relative-path"
 cd "$TS_OUTDIR" > /dev/null
-$TS_CMD_MOUNT --all --fstab $(basename "${TS_FSTAB}") >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" \
+$TS_CMD_MOUNT --all --fstab "$(basename "${TS_FSTAB}")" >> "$TS_OUTPUT" 2>> "$TS_ERRLOG" \
                        || ts_log "mount failed"
 udevadm settle
 $TS_CMD_UMOUNT ${MOUNTPOINT}{A,B,C,D} || ts_log "umount failed"

diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index 3f5fe4b515f9493ead542fd27c38ed2d68f44d8b..ca3b9cb64383be083eb07fd82a6dc359000a1e35 100755 (executable)
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -44,7 +44,7 @@ ts_fstab_add $DEVICE
 ts_init_subtest "mountpoint"
 $TS_CMD_MOUNT --fstab "$TS_FSTAB" $MOUNTPOINT >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_is_mounted $DEVICE || ts_log "Cannot find $DEVICE in /proc/mounts"
-$TS_CMD_UMOUNT $DEVICE || >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
+$TS_CMD_UMOUNT $DEVICE >> "$TS_OUTPUT" 2>> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "device-name"