From: Karel Zak <kzak@redhat.com>
Date: Wed, 22 Dec 2010 12:13:45 +0000 (+0100)
Subject: tests: check for mtab
X-Git-Tag: v2.19-rc1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e46119a41173703ad8ff403710ce76b92765dfa6;p=thirdparty%2Futil-linux.git

tests: check for mtab

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

diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname
index 0448a4b34a..4cbd08711f 100755
--- a/tests/ts/mount/devname
+++ b/tests/ts/mount/devname
@@ -38,8 +38,14 @@ $TS_CMD_MOUNT $DEVICE $TS_MOUNTPOINT 2>&1 >> $TS_OUTPUT
 
 ts_is_mounted $DEVICE || ts_die "Cannot found $DEVICE in /proc/mounts" $DEVICE
 
+grep -q $DEVICE /etc/mtab ||
+	echo "mount failed: cannot found $DEVICE in mtab" >> $TS_OUTPUT 2>&1
+
 $TS_CMD_UMOUNT $DEVICE || ts_die "Cannot umount $DEVICE" $DEVICE
 
+grep -q $DEVICE /etc/mtab &&
+	echo "umount failed: found $DEVICE in mtab" >> $TS_OUTPUT 2>&1
+
 ts_device_deinit $DEVICE
 
 ts_log "Success"
diff --git a/tests/ts/mount/mtablock b/tests/ts/mount/mtablock
index b9f710ef8e..445e893e3d 100755
--- a/tests/ts/mount/mtablock
+++ b/tests/ts/mount/mtablock
@@ -23,7 +23,7 @@ ts_init "$*"
 ts_skip_nonroot
 
 if [ ! -x "$TS_CMD_MTABLOCK" ]; then
-	ts_slip "not compiled"
+	ts_skip "not compiled"
 fi
 
 #