summaryrefslogtreecommitdiffstats
path: root/tests/ts/libmount/context
diff options
context:
space:
mode:
authorKarel Zak2011-02-09 15:02:41 +0100
committerKarel Zak2011-02-09 15:02:41 +0100
commitcddd0999a227013a11e5b5ba2dfa36c9d7ef1cdc (patch)
treef34c4eeb109f9f4554326b539ea0587f90d61a2d /tests/ts/libmount/context
parentlibuuid: do not check for EAGAIN after flock() (diff)
downloadkernel-qcow2-util-linux-cddd0999a227013a11e5b5ba2dfa36c9d7ef1cdc.tar.gz
kernel-qcow2-util-linux-cddd0999a227013a11e5b5ba2dfa36c9d7ef1cdc.tar.xz
kernel-qcow2-util-linux-cddd0999a227013a11e5b5ba2dfa36c9d7ef1cdc.zip
tests: fix libmount test
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount/context')
-rwxr-xr-xtests/ts/libmount/context5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context
index 4248f3132..b63f8c55a 100755
--- a/tests/ts/libmount/context
+++ b/tests/ts/libmount/context
@@ -14,12 +14,15 @@ LABEL=libmount-test
UUID=$(uuidgen)
MOUNTPOINT="$TS_MOUNTPOINT"
+#set -x
+
[ -x $TESTPROG ] || ts_skip "test not compiled"
modprobe --dry-run --quiet scsi_debug
[ "$?" == 0 ] || ts_skip "missing scsi_debug module"
ts_log "Init device"
+umount $MOUNTPOINT &> /dev/null
rmmod scsi_debug &> /dev/null
modprobe scsi_debug dev_size_mb=100
[ "$?" == 0 ] || ts_die "Cannot init device"
@@ -58,6 +61,7 @@ export LIBMOUNT_MTAB=$TS_OUTPUT.mtab
ts_init_subtest "mount-by-devname"
mkdir -p $MOUNTPOINT &> /dev/null
$TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
+
grep -q $DEVICE $LIBMOUNT_MTAB || \
echo "(by device) cannot found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1
ts_finalize_subtest
@@ -68,6 +72,7 @@ grep -q $DEVICE $LIBMOUNT_MTAB &&
echo "umount (device) failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1
ts_finalize_subtest
+#exit 1
ts_init_subtest "mount-by-label"
mkdir -p $MOUNTPOINT &> /dev/null