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

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

This was almost useless anyway.

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

diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 7acfb9cdf8..373e1d3d14 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -65,7 +65,7 @@ export LIBMOUNT_MTAB=$TS_OUTPUT.mtab
 > $LIBMOUNT_MTAB
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
diff --git a/tests/ts/libmount/context-py b/tests/ts/libmount/context-py
index b2355a7955..94c0d071b4 100755
--- a/tests/ts/libmount/context-py
+++ b/tests/ts/libmount/context-py
@@ -67,7 +67,7 @@ export LIBMOUNT_MTAB=$TS_OUTPUT.mtab
 > $LIBMOUNT_MTAB
 
 udevadm settle
-ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
+ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE"
 
 ts_init_subtest "mount-by-devname"
 mkdir -p $MOUNTPOINT &>  /dev/null
diff --git a/tests/ts/libmount/tabfiles-tags b/tests/ts/libmount/tabfiles-tags
index 15696b0765..662d38b6c6 100755
--- a/tests/ts/libmount/tabfiles-tags
+++ b/tests/ts/libmount/tabfiles-tags
@@ -24,10 +24,10 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE
+mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
 udevadm settle
 
-ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE
+ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE"
 
 FSTAB="$TS_OUTDIR/fstab"
 
diff --git a/tests/ts/libmount/tabfiles-tags-py b/tests/ts/libmount/tabfiles-tags-py
index d6ca470fb4..47efa70e1d 100755
--- a/tests/ts/libmount/tabfiles-tags-py
+++ b/tests/ts/libmount/tabfiles-tags-py
@@ -27,10 +27,10 @@ UUID="de1bc6e9-34ab-4151-a1d7-900042eee8d9"
 #
 # Create filesystem
 #
-mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE" $TS_DEVICE
+mkfs.ext3 -F -L $LABEL $TS_DEVICE -U $UUID &> /dev/null || ts_die "Cannot make ext3 on $TS_DEVICE"
 udevadm settle
 
-ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE" $TS_DEVICE
+ts_device_has_uuid $TS_DEVICE || ts_die "Cannot find UUID on $TS_DEVICE"
 
 FSTAB="$TS_OUTDIR/fstab"