tests: make tests more portable due to mtab

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

4 files changed, 25 insertions, 7 deletions

diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index caa79f7bb..65a1ba217 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -32,6 +32,12 @@ ts_check_prog "mkfs.ext3"
 ts_device_init
 DEVICE=$TS_LODEV
 
+MTAB_FILE="/proc/mounts"
+has_mtab=$( ts_has_mtab_support )
+if [ "$has_mtab" == "yes" ]; then
+	MTAB_FILE="/etc/mtab"
+fi
+
 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"
@@ -42,13 +48,13 @@ $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT >> $TS_OUTPUT 2>&1
 
 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
+grep -q $DEVICE $MTAB_FILE ||
+	echo "mount failed: cannot find $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>&1
 
 $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
+grep -q $DEVICE $MTAB_FILE &&
+	echo "umount failed: found $DEVICE in $MTAB_FILE" >> $TS_OUTPUT 2>&1
 
 ts_log "Success"
 ts_finalize
diff --git a/tests/ts/mount/remount b/tests/ts/mount/remount
index 717692752..38db9bf9f 100755
--- a/tests/ts/mount/remount
+++ b/tests/ts/mount/remount
@@ -34,14 +34,20 @@ ts_check_prog "mkfs.ext2"
 ts_device_init
 DEVICE=$TS_LODEV
 
+MTAB_FILE="/proc/mounts"
+has_mtab=$( ts_has_mtab_support )
+if [ "$has_mtab" == "yes" ]; then
+	MTAB_FILE="/etc/mtab"
+fi
+
 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"
 
 # check the mount
-egrep -q "^$DEVICE $TS_MOUNTPOINT" /etc/mtab \
- || ts_die "Cannot find $TS_MOUNTPOINT in /etc/mtab"
+egrep -q "^$DEVICE $TS_MOUNTPOINT" $MTAB_FILE \
+ || ts_die "Cannot find $TS_MOUNTPOINT in $MTAB_FILE"
 
 # remount
 $TS_CMD_MOUNT -o remount,ro $TS_MOUNTPOINT \
diff --git a/tests/ts/mount/rlimit b/tests/ts/mount/rlimit
index d6a64ec75..9564d7046 100755
--- a/tests/ts/mount/rlimit
+++ b/tests/ts/mount/rlimit
@@ -37,6 +37,9 @@ ts_skip_nonroot
 ts_check_losetup
 ts_check_prog "mkfs.ext3"
 
+has_mtab=$( ts_has_mtab_support )
+[ "$has_mtab" == "yes" ] || ts_skip "mtab unsupported"
+
 [ -L /etc/mtab ] && ts_skip "mtab is symlink"
 [ "$(stat --format '%s' /etc/mtab)" -gt "1024" ] || ts_skip "mtab is too small"
 
diff --git a/tests/ts/mount/umount-alltargets b/tests/ts/mount/umount-alltargets
index 59c7e0394..53073023a 100755
--- a/tests/ts/mount/umount-alltargets
+++ b/tests/ts/mount/umount-alltargets
@@ -18,7 +18,10 @@ ts_check_prog "mkfs.ext2"
 $TS_CMD_UMOUNT --help | grep -q all-targets
 [ $? -eq 1 ] && ts_skip "all-targets unsupported"
 
-[ -L /etc/mtab ] || ts_skip "regular mtab"
+has_mtab=$( ts_has_mtab_support )
+if [ "$has_mtab" == "yes" ]; then
+	[ -L /etc/mtab ] || ts_skip "regular mtab"
+fi
 
 # set global variable TS_DEVICE
 ts_scsi_debug_init dev_size_mb=50