summaryrefslogtreecommitdiffstats
path: root/tests/ts
diff options
context:
space:
mode:
authorKarel Zak2009-12-04 20:30:16 +0100
committerKarel Zak2009-12-04 20:30:16 +0100
commit283a8c15988e65e6c4741c7d7739b969e7383203 (patch)
tree24aa452344ab7f1a85775090c60e523090f15aaf /tests/ts
parentbuild-sys: check for pkg-config before gtk-doc (diff)
downloadkernel-qcow2-util-linux-283a8c15988e65e6c4741c7d7739b969e7383203.tar.gz
kernel-qcow2-util-linux-283a8c15988e65e6c4741c7d7739b969e7383203.tar.xz
kernel-qcow2-util-linux-283a8c15988e65e6c4741c7d7739b969e7383203.zip
tests: remove vol_id from tests
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts')
-rwxr-xr-xtests/ts/cramfs/mkfs3
-rwxr-xr-xtests/ts/mount/fstab-label2
-rwxr-xr-xtests/ts/mount/fstab-label2devname2
-rwxr-xr-xtests/ts/mount/fstab-label2uuid2
-rwxr-xr-xtests/ts/mount/fstab-uuid2
-rwxr-xr-xtests/ts/mount/fstab-uuid2devname2
-rwxr-xr-xtests/ts/mount/fstab-uuid2label2
-rwxr-xr-xtests/ts/mount/label3
-rwxr-xr-xtests/ts/mount/uuid3
-rwxr-xr-xtests/ts/swapon/label2
-rwxr-xr-xtests/ts/swapon/uuid2
11 files changed, 0 insertions, 25 deletions
diff --git a/tests/ts/cramfs/mkfs b/tests/ts/cramfs/mkfs
index 98e5172c1..eb85c55cf 100755
--- a/tests/ts/cramfs/mkfs
+++ b/tests/ts/cramfs/mkfs
@@ -70,9 +70,6 @@ ts_log "check the image"
ts_device_has "TYPE" "cramfs" $DEVICE
[ "$?" == "0" ] || ts_die "Cannot found cramfs on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL
-[ "$?" == "0" ] || ts_skip "udev ignores /dev/loop*" $DEVICE
-
ts_log "mount the image"
$TS_CMD_MOUNT -L $LABEL $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
diff --git a/tests/ts/mount/fstab-label b/tests/ts/mount/fstab-label
index 375a1ba72..21903830d 100755
--- a/tests/ts/mount/fstab-label
+++ b/tests/ts/mount/fstab-label
@@ -33,8 +33,6 @@ mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "LABEL=$LABEL"
diff --git a/tests/ts/mount/fstab-label2devname b/tests/ts/mount/fstab-label2devname
index f53de4fb2..6ae9bffb5 100755
--- a/tests/ts/mount/fstab-label2devname
+++ b/tests/ts/mount/fstab-label2devname
@@ -33,8 +33,6 @@ mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "$DEVICE"
diff --git a/tests/ts/mount/fstab-label2uuid b/tests/ts/mount/fstab-label2uuid
index 1c90c2eda..f74cdf292 100755
--- a/tests/ts/mount/fstab-label2uuid
+++ b/tests/ts/mount/fstab-label2uuid
@@ -34,8 +34,6 @@ mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $DEVICE
-
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
diff --git a/tests/ts/mount/fstab-uuid b/tests/ts/mount/fstab-uuid
index 7f78e45e3..73b59dcc4 100755
--- a/tests/ts/mount/fstab-uuid
+++ b/tests/ts/mount/fstab-uuid
@@ -33,8 +33,6 @@ ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
-ts_udev_dev_support "by-uuid" $UUID || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "UUID=$UUID"
diff --git a/tests/ts/mount/fstab-uuid2devname b/tests/ts/mount/fstab-uuid2devname
index b1d2e7773..a013d2eb1 100755
--- a/tests/ts/mount/fstab-uuid2devname
+++ b/tests/ts/mount/fstab-uuid2devname
@@ -33,8 +33,6 @@ ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
-ts_udev_dev_support "by-uuid" $UUID || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
ts_fstab_add "$DEVICE"
diff --git a/tests/ts/mount/fstab-uuid2label b/tests/ts/mount/fstab-uuid2label
index 7b21dfa22..94fb51767 100755
--- a/tests/ts/mount/fstab-uuid2label
+++ b/tests/ts/mount/fstab-uuid2label
@@ -33,8 +33,6 @@ mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $DEVICE
-
ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
diff --git a/tests/ts/mount/label b/tests/ts/mount/label
index 05df26ac7..c880e4b3b 100755
--- a/tests/ts/mount/label
+++ b/tests/ts/mount/label
@@ -34,9 +34,6 @@ mkfs.ext3 -L $LABEL $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE"
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL \
- || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
# variant A)
diff --git a/tests/ts/mount/uuid b/tests/ts/mount/uuid
index e46110318..79842306c 100755
--- a/tests/ts/mount/uuid
+++ b/tests/ts/mount/uuid
@@ -33,9 +33,6 @@ ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
-ts_udev_dev_support "by-uuid" $UUID \
- || ts_skip "udev ignores /dev/loop*" $DEVICE
-
[ -d "$TS_MOUNTPOINT" ] || mkdir -p $TS_MOUNTPOINT
# variant A)
diff --git a/tests/ts/swapon/label b/tests/ts/swapon/label
index 5a5e2650d..ec0de66f3 100755
--- a/tests/ts/swapon/label
+++ b/tests/ts/swapon/label
@@ -34,8 +34,6 @@ $TS_CMD_MKSWAP -L $LABEL $DEVICE > /dev/null 2>> $TS_OUTPUT \
ts_device_has "LABEL" $LABEL $DEVICE \
|| ts_die "Cannot found LABEL '$LABEL' on $DEVICE" $DEVICE
-ts_udev_dev_support "by-label" $LABEL || ts_skip "udev ignores /dev/loop*" $DEVICE
-
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -L $LABEL 2>&1 >> $TS_OUTPUT
diff --git a/tests/ts/swapon/uuid b/tests/ts/swapon/uuid
index 373afd3cd..3c015d9e0 100755
--- a/tests/ts/swapon/uuid
+++ b/tests/ts/swapon/uuid
@@ -34,8 +34,6 @@ ts_device_has_uuid $DEVICE || ts_die "Cannot found UUID on $DEVICE" $DEVICE
UUID=$(ts_uuid_by_devname $DEVICE)
-ts_udev_dev_support "by-uuid" $UUID || ts_skip "udev ignores /dev/loop*" $DEVICE
-
LD_LIBRARY_PATH="$U_L_LIBRARY_PATH" \
$TS_CMD_SWAPON -U $UUID 2>&1 >> $TS_OUTPUT