From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Tue, 31 Mar 2015 12:35:07 +0000 (+0200)
Subject: tests: loop tests, don't call ts_die() with DEVICE parameter
X-Git-Tag: v2.27-rc1~258^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1849be96a2f3baff3a7c3776be2d02af20bea81;p=thirdparty%2Futil-linux.git

tests: loop tests, don't call ts_die() with DEVICE parameter

Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---

diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index a5a3bf565c..eff9d455c1 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -90,13 +90,13 @@ ts_register_loop_device "$DEVICE"
 
 ts_log "check the image"
 ts_device_has "TYPE" "cramfs" $DEVICE
-[  "$?" == "0" ] || ts_die "Cannot find cramfs on $DEVICE" $DEVICE
+[  "$?" == "0" ] || ts_die "Cannot find cramfs on $DEVICE"
 
 ts_log "mount the image"
 ts_mount "cramfs" -r -L $LABEL $TS_MOUNTPOINT
 
 # check it
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 
 ts_cd "$TS_MOUNTPOINT"
 
diff --git a/tests/ts/fsck/ismounted b/tests/ts/fsck/ismounted
index e4f0b4d30f..25bcff9e40 100755
--- a/tests/ts/fsck/ismounted
+++ b/tests/ts/fsck/ismounted
@@ -34,9 +34,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
@@ -45,6 +45,6 @@ $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1
 # test by ismounted.c
 $TS_HELPER_ISMOUNTED $DEVICE | awk '{print $1}' >> $TS_OUTPUT 2>&1
 
-$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
+$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
 ts_finalize
diff --git a/tests/ts/minix/mkfs b/tests/ts/minix/mkfs
index 8972037412..3872135364 100755
--- a/tests/ts/minix/mkfs
+++ b/tests/ts/minix/mkfs
@@ -41,7 +41,7 @@ ts_log "mount the filesystem"
 ts_mount "minix" $DEVICE $TS_MOUNTPOINT
 
 # check it
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 
 ts_log "umount the image"
 $TS_CMD_UMOUNT $DEVICE
diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index 94df49e945..f4bfebd0fc 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -34,20 +34,20 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 
 grep -q $DEVICE /etc/mtab ||
 	echo "mount failed: cannot find $DEVICE in mtab" >> $TS_OUTPUT 2>&1
 
-$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
+$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
 grep -q $DEVICE /etc/mtab &&
 	echo "umount failed: found $DEVICE in mtab" >> $TS_OUTPUT 2>&1
diff --git a/tests/ts/mount/fslists b/tests/ts/mount/fslists
index 3596aa8e1b..28bba6c484 100755
--- a/tests/ts/mount/fslists
+++ b/tests/ts/mount/fslists
@@ -34,9 +34,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 # Don't forget that $TS_MOUNTPOINT is subtest specific, don't create it
 # globally!
@@ -45,7 +45,7 @@ ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEV
 ts_init_subtest "one-type"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT -t ext3 $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
 ts_finalize_subtest
@@ -54,7 +54,7 @@ ts_finalize_subtest
 ts_init_subtest "more-types"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT -t foo,bar,ext3 $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
 ts_finalize_subtest
@@ -65,7 +65,7 @@ ts_init_subtest "more-types-fstab"
 ts_fstab_add $DEVICE $TS_MOUNTPOINT "foo,bar,ext3"
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 ts_fstab_clean
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
 ts_finalize_subtest
@@ -74,7 +74,7 @@ ts_finalize_subtest
 ts_init_subtest "type-pattern"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT -t nofoo,bar $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
 $TS_CMD_UMOUNT $TS_MOUNTPOINT
 ts_log "Success"
 ts_finalize_subtest
@@ -83,7 +83,7 @@ ts_finalize_subtest
 ts_init_subtest "type-pattern-neg"
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 $TS_CMD_MOUNT -t nofoo,bar,ext3,ext2,ext4 $DEVICE $TS_MOUNTPOINT &> /dev/null
-ts_is_mounted $DEVICE && ts_die "$DEVICE unexpectedly mounted" $DEVICE
+ts_is_mounted $DEVICE && ts_die "$DEVICE unexpectedly mounted"
 ts_log "Success"
 ts_finalize_subtest
 
diff --git a/tests/ts/mount/fstab-devname b/tests/ts/mount/fstab-devname
index f91419503d..a80934330b 100755
--- a/tests/ts/mount/fstab-devname
+++ b/tests/ts/mount/fstab-devname
@@ -33,9 +33,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
@@ -43,13 +43,13 @@ ts_fstab_add $DEVICE
 
 # variant A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-devname2label b/tests/ts/mount/fstab-devname2label
index 2460a45e20..8519b498c0 100755
--- a/tests/ts/mount/fstab-devname2label
+++ b/tests/ts/mount/fstab-devname2label
@@ -34,18 +34,18 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 ts_fstab_add "LABEL=$LABEL"
 
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-devname2uuid b/tests/ts/mount/fstab-devname2uuid
index 2013a10eb7..31bb3d0535 100755
--- a/tests/ts/mount/fstab-devname2uuid
+++ b/tests/ts/mount/fstab-devname2uuid
@@ -33,9 +33,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -44,8 +44,8 @@ UUID=$(ts_uuid_by_devname $DEVICE)
 ts_fstab_add "UUID=$UUID"
 
 $TS_CMD_MOUNT $DEVICE 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index e9ce432e7d..2c925fb09a 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -34,10 +34,10 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
@@ -45,18 +45,18 @@ ts_fstab_add "LABEL=$LABEL"
 
 # variant A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 # variant C)
 $TS_CMD_MOUNT LABEL=$LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index 11a58e07ac..4cb34d7643 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -34,10 +34,10 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
@@ -45,13 +45,13 @@ ts_fstab_add "$DEVICE"
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 4b6bd5efc4..a02ba41f87 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -35,12 +35,12 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -50,13 +50,13 @@ ts_fstab_add "UUID=$UUID"
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT "LABEL=$LABEL" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-symlink b/tests/ts/mount/fstab-symlink
index a457687552..2579c85afd 100755
--- a/tests/ts/mount/fstab-symlink
+++ b/tests/ts/mount/fstab-symlink
@@ -36,9 +36,9 @@ LINKNAME="$TS_OUTDIR/${TS_TESTNAME}_lnk"
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
@@ -49,8 +49,8 @@ ts_fstab_add $LINKNAME $TS_MOUNTPOINT "auto" "defaults,user"
 
 # variant A) -- UID=0
 $TS_CMD_MOUNT $LINKNAME 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME"
 
 # varian B) -- disabled, the $TS_CMD_MOUNT is usually not a real program, but
 #              libtool wrapper and the real mount is exec()ed with
@@ -61,9 +61,9 @@ $TS_CMD_UMOUNT $LINKNAME || ts_die "A) Cannot umount $LINKNAME" $DEVICE
 #
 #su $TS_TESTUSER -c "$TS_CMD_MOUNT -v -v -v $LINKNAME" 2>&1 >> $TS_OUTPUT
 #ts_is_mounted $DEVICE
-#   || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
+#   || ts_die "B) Cannot find $DEVICE in /proc/mounts"
 #su $TS_TESTUSER -c "$TS_CMD_UMOUNT $LINKNAME" 2>&1 >> $TS_OUTPUT \
-#   || ts_die "B) Cannot umount $LINKNAME" $DEVICE
+#   || ts_die "B) Cannot umount $LINKNAME"
 
 ts_fstab_clean
 rm -f $LINKNAME
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index ccb941653e..e3bb1e7f55 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -33,9 +33,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -45,18 +45,18 @@ ts_fstab_add "UUID=$UUID"
 
 # varian A)
 $TS_CMD_MOUNT $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # varian B)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 # varian C)
 $TS_CMD_MOUNT UUID=$UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "C) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "C) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index b2654a7b45..ac0b932e3b 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -33,9 +33,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -45,13 +45,13 @@ ts_fstab_add "$DEVICE"
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index d81f48a2b5..edcdc0c535 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -34,12 +34,12 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -49,13 +49,13 @@ ts_fstab_add "LABEL=$LABEL"
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT "UUID=$UUID" 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_fstab_clean
 
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 19dbb06500..2becdb5890 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -35,22 +35,22 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
 [ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
 
 # variant A)
 $TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT LABEL=$LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 95d5e8d4b1..9fa14b6b8c 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -34,18 +34,18 @@ ts_check_losetup
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE" $DEVICE
+mkfs.ext2 $DEVICE &> /dev/null || ts_die "Cannot make ext2 on $DEVICE"
 
 # mount read-write
-$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT || ts_die "Cannot mount $TS_MOUNTPOINT" $DEVICE
+$TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT || ts_die "Cannot mount $TS_MOUNTPOINT"
 
 # check the mount
 egrep -q "^$DEVICE $TS_MOUNTPOINT" /etc/mtab \
- || ts_die "Cannot find $TS_MOUNTPOINT in /etc/mtab" $DEVICE
+ || ts_die "Cannot find $TS_MOUNTPOINT in /etc/mtab"
 
 # remount
 $TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
- || ts_die "Cannot remount $TS_MOUNTPOINT" $DEVICE
+ || ts_die "Cannot remount $TS_MOUNTPOINT"
 
 # check the remount
 $TS_CMD_FINDMNT --kernel --mountpoint "$TS_MOUNTPOINT" --options "ro" &> /dev/null
diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index f75a91ed41..223f717dd7 100755
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -49,7 +49,7 @@ function mtab_checksum()
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
 
 ts_init_subtest "mount"
diff --git a/tests/ts/mount/shared-subtree b/tests/ts/mount/shared-subtree
index f7b4b69ece..b68a1aa99f 100755
--- a/tests/ts/mount/shared-subtree
+++ b/tests/ts/mount/shared-subtree
@@ -62,8 +62,8 @@ ts_finalize_subtest
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
-ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
+ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 
 ts_init_subtest "mount-private"
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index fe6c377b95..4dec89a791 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -33,9 +33,9 @@ set -o pipefail
 ts_device_init
 DEVICE=$TS_LODEV
 
-mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
+mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
@@ -43,13 +43,13 @@ UUID=$(ts_uuid_by_devname $DEVICE)
 
 # variant A)
 $TS_CMD_MOUNT -U $UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "A) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "A) Cannot umount $DEVICE"
 
 # variant B)
 $TS_CMD_MOUNT UUID=$UUID $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
-ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts" $DEVICE
-$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE" $DEVICE
+ts_is_mounted $DEVICE || ts_die "B) Cannot find $DEVICE in /proc/mounts"
+$TS_CMD_UMOUNT $DEVICE || ts_die "B) Cannot umount $DEVICE"
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/swapon/devname b/tests/ts/swapon/devname
index 59d8e1ec09..e1ae4f5a47 100755
--- a/tests/ts/swapon/devname
+++ b/tests/ts/swapon/devname
@@ -34,13 +34,13 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
- || ts_die "Cannot make swap $DEVICE" $DEVICE
+ || ts_die "Cannot make swap $DEVICE"
 
-ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE
+ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
 
 $TS_CMD_SWAPON $DEVICE 2>&1 >> $TS_OUTPUT
 
-grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
diff --git a/tests/ts/swapon/fixpgsz b/tests/ts/swapon/fixpgsz
index 1e6a7ccc1e..b1f4035fd1 100755
--- a/tests/ts/swapon/fixpgsz
+++ b/tests/ts/swapon/fixpgsz
@@ -32,16 +32,16 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 $TS_CMD_MKSWAP -L MyFooBarLabel --pagesize $BADSIZE $DEVICE > /dev/null &> /dev/null \
- || ts_die "Cannot make swap $DEVICE" $DEVICE
+ || ts_die "Cannot make swap $DEVICE"
 
-ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE
+ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
 
 #
 # Swapon
 #
 $TS_CMD_SWAPON --fixpgsz $DEVICE  &> /dev/null
 
-grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
diff --git a/tests/ts/swapon/fixsig b/tests/ts/swapon/fixsig
index 0564459462..3d1bf6355e 100755
--- a/tests/ts/swapon/fixsig
+++ b/tests/ts/swapon/fixsig
@@ -24,9 +24,9 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
- || ts_die "Cannot make swap $DEVICE" $DEVICE
+ || ts_die "Cannot make swap $DEVICE"
 
-ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE" $DEVICE
+ts_device_has "TYPE" "swap" $DEVICE || ts_die "Cannot find swap on $DEVICE"
 
 #
 # Rewrite signature to swsuspend
@@ -35,14 +35,14 @@ echo "S2SUSPEND " > $TS_OUTPUT.signature
 dd if=$TS_OUTPUT.signature of=$DEVICE \
 	seek=$(( $PAGESIZE - 10 )) count=10 bs=1 conv=notrunc &> /dev/null
 
-ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DEVICE" $DEVICE
+ts_device_has "TYPE" "swsuspend" $DEVICE || ts_die "Cannot find swsuspend on $DEVICE"
 
 #
 # Swapon
 #
 $TS_CMD_SWAPON $DEVICE &> /dev/null
 
-grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 488531ab7a..2018f9cfb9 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -35,14 +35,14 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
- || ts_die "Cannot make swap on $DEVICE" $DEVICE
+ || ts_die "Cannot make swap on $DEVICE"
 
 ts_device_has "LABEL" $LABEL $DEVICE \
- || ts_die "Cannot find LABEL '$LABEL' on $DEVICE" $DEVICE
+ || ts_die "Cannot find LABEL '$LABEL' on $DEVICE"
 
 $TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT
 
-grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE
 
diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index b01d9b17b1..65d019c29b 100755
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -34,15 +34,15 @@ ts_device_init
 DEVICE=$TS_LODEV
 
 $TS_CMD_MKSWAP $DEVICE > /dev/null 2>> $TS_OUTPUT \
- || ts_die "Cannot make swap $DEVICE" $DEVICE
+ || ts_die "Cannot make swap $DEVICE"
 
-ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE" $DEVICE
+ts_device_has_uuid $DEVICE || ts_die "Cannot find UUID on $DEVICE"
 
 UUID=$(ts_uuid_by_devname $DEVICE)
 
 $TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT
 
-grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps" $DEVICE
+grep -q $DEVICE /proc/swaps || ts_die "Cannot find $DEVICE in /proc/swaps"
 
 $TS_CMD_SWAPOFF $DEVICE