From: Karel Zak <kzak@redhat.com>
Date: Thu, 12 Jan 2012 19:37:21 +0000 (+0100)
Subject: tests: add exceptions for libmount
X-Git-Tag: v2.21-rc1~48
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25331447462324f533e29466e2554236e246077c;p=thirdparty%2Futil-linux.git

tests: add exceptions for libmount

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

diff --git a/tests/ts/mount/fstab-broken b/tests/ts/mount/fstab-broken
index 46f272a9b5..48fe1a18d8 100755
--- a/tests/ts/mount/fstab-broken
+++ b/tests/ts/mount/fstab-broken
@@ -32,7 +32,6 @@ ts_fstab_open
 echo "tmpd $MNT tmpfs" >> /etc/fstab
 ts_fstab_close
 
-
 ts_init_subtest "mount"
 $TS_CMD_MOUNT $MNT &> /dev/null
 $TS_CMD_FINDMNT --kernel --target "$MNT" &> /dev/null
diff --git a/tests/ts/mount/noncanonical b/tests/ts/mount/noncanonical
index 528861abe6..1d28304e02 100755
--- a/tests/ts/mount/noncanonical
+++ b/tests/ts/mount/noncanonical
@@ -24,6 +24,9 @@ ts_skip_nonroot
 
 [ ! -e "/etc" ] && ts_skip "/etc not such file of directory"
 
+$TS_CMD_MOUNT -V | grep -q "libmount"
+[ $? -eq 0 ] && ts_skip "libmount version"
+
 # Don't canonicalize SPEC for cifs, nfs, smbfs, ...
 $TS_CMD_MOUNT -v -v -v -f -i -n -t cifs //etc /foo | grep "spec:" >> $TS_OUTPUT 2>&1
 
diff --git a/tests/ts/mount/paths b/tests/ts/mount/paths
index f2f09d4d26..0b3432bd9d 100755
--- a/tests/ts/mount/paths
+++ b/tests/ts/mount/paths
@@ -22,6 +22,9 @@ TS_DESC="basic paths"
 ts_init "$*"
 ts_skip_nonroot
 
+$TS_CMD_MOUNT -V | grep -q "libmount"
+[ $? -eq 0 ] && ts_skip "libmount version"
+
 $TS_CMD_MOUNT -n -f -v -v -v /dev/dummy /mnt &> $TS_OUTPUT
 
 ts_finalize
diff --git a/tests/ts/mount/regfile b/tests/ts/mount/regfile
index fa5605e3bb..c47c7d7950 100755
--- a/tests/ts/mount/regfile
+++ b/tests/ts/mount/regfile
@@ -23,7 +23,7 @@ DEVICE=$(awk '/regfile/ { print $1 }' /proc/mounts)
 
 grep -q "$TS_MOUNTPOINT" /proc/mounts || ts_die "Cannot find $TS_MOUNTPOINT in /proc/mounts"
 
-if [ -f "/sys/block/$(basename $DEVICE)/loop" ]; then
+if [ -f "/sys/block/$(basename $DEVICE)/loop/backing_file" ]; then
 	$TS_CMD_UMOUNT $IMAGE || ts_die "Cannot umount $IMAGE"
 else
 	$TS_CMD_UMOUNT $TS_MOUNTPOINT &> /dev/null