From e46119a41173703ad8ff403710ce76b92765dfa6 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 22 Dec 2010 13:13:45 +0100 Subject: [PATCH] tests: check for mtab Signed-off-by: Karel Zak --- tests/ts/mount/devname | 6 ++++++ tests/ts/mount/mtablock | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/ts/mount/devname b/tests/ts/mount/devname index 0448a4b3..4cbd0871 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 b9f710ef..445e893e 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 # -- 2.39.5