diff options
author | Karel Zak | 2015-04-14 11:26:54 +0200 |
---|---|---|
committer | Karel Zak | 2015-04-14 11:26:54 +0200 |
commit | 866372c699ab1bdc692ddbb6c27c91dd1e20b4b9 (patch) | |
tree | b09f3379f7b710cad210f5d51b96f9b18503cfb3 /tests/ts/libmount | |
parent | fdisk: fix typo (diff) | |
download | kernel-qcow2-util-linux-866372c699ab1bdc692ddbb6c27c91dd1e20b4b9.tar.gz kernel-qcow2-util-linux-866372c699ab1bdc692ddbb6c27c91dd1e20b4b9.tar.xz kernel-qcow2-util-linux-866372c699ab1bdc692ddbb6c27c91dd1e20b4b9.zip |
tests: make libmount context tests sensitive to USE_LIBMOUNT_FORCE_MOUNTINFO
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'tests/ts/libmount')
-rwxr-xr-x | tests/ts/libmount/context | 50 |
1 files changed, 29 insertions, 21 deletions
diff --git a/tests/ts/libmount/context b/tests/ts/libmount/context index 7acfb9cdf..6de160bea 100755 --- a/tests/ts/libmount/context +++ b/tests/ts/libmount/context @@ -34,6 +34,11 @@ umount $MOUNTPOINT &> /dev/null ts_scsi_debug_init dev_size_mb=100 DEVNAME=$(basename $TS_DEVICE) +grep -q '#define USE_LIBMOUNT_FORCE_MOUNTINFO' ${TS_TOPDIR}/../config.h +if [ $? == 0 ]; then + MOUNTINFO_ONLY=yes +fi + ts_log "Create partitions" $TS_CMD_FDISK ${TS_DEVICE} &> /dev/null <<EOF n @@ -64,47 +69,53 @@ ts_log "Do tests..." export LIBMOUNT_MTAB=$TS_OUTPUT.mtab > $LIBMOUNT_MTAB +# check local mtab of system mountinfo +function is_mounted { + if [ "$MOUNTINFO_ONLY" = "yes" ]; then + ts_is_mounted "$1" + return $? + fi + grep -q "$1" $LIBMOUNT_MTAB && return 0 + return 1 +} + + udevadm settle ts_device_has "TYPE" "ext4" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE + ts_init_subtest "mount-by-devname" mkdir -p $MOUNTPOINT &> /dev/null ts_valgrind $TESTPROG --mount $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 - -grep -q $DEVICE $LIBMOUNT_MTAB || \ - echo "(by device) cannot find $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest + ts_init_subtest "umount-by-devname" ts_valgrind $TESTPROG --umount $DEVICE >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB && - echo "umount (device) failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "mount-by-label" mkdir -p $MOUNTPOINT &> /dev/null ts_valgrind $TESTPROG --mount LABEL="$LABEL" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB || \ - echo "(by label) cannot find $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "umount-by-mountpoint" ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB && \ - echo "umount (mountpoint) failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest ts_init_subtest "mount-by-uuid" mkdir -p $MOUNTPOINT &> /dev/null ts_valgrind $TESTPROG --mount UUID="$UUID" $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB || \ - echo "(by uuid) cannot find $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB && - echo "umount failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -112,15 +123,13 @@ ts_init_subtest "mount-flags" mkdir -p $MOUNTPOINT &> /dev/null ts_valgrind $TESTPROG --mount -o ro,noexec,nosuid,strictatime $DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1 $TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB || \ - echo "cannot find $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE || echo "$DEVICE not mounted" >> $TS_OUTPUT 2>&1 ts_valgrind $TESTPROG --mount -o remount,rw $MOUNTPOINT >> $TS_OUTPUT 2>&1 $TS_CMD_FINDMNT --kernel $MOUNTPOINT -o VFS-OPTIONS -n >> $TS_OUTPUT 2>&1 ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $DEVICE $LIBMOUNT_MTAB && - echo "umount failed: found $DEVICE in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $DEVICE && echo "$DEVICE still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest @@ -131,14 +140,13 @@ mkfs.ext3 -F $img &> /dev/null udevadm settle ts_valgrind $TESTPROG --mount -o loop $img $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $MOUNTPOINT $LIBMOUNT_MTAB || \ - echo "(loopdev) cannot find $MOUNTPOINT in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $MOUNTPOINT || echo "$MOUNTPOINT not mounted" >> $TS_OUTPUT 2>&1 udevadm settle ts_valgrind $TESTPROG --umount $MOUNTPOINT >> $TS_OUTPUT 2>&1 -grep -q $MOUNTPOINT $LIBMOUNT_MTAB && - echo "umount failed: found $MOUNTPOINT in $LIBMOUNT_MTAB" >> $TS_OUTPUT 2>&1 +is_mounted $MOUNTPOINT && echo "$MOUNTPOINT still mounted" >> $TS_OUTPUT 2>&1 ts_finalize_subtest + ts_init_subtest "x-mount.mkdir" $TS_CMD_MOUNT -o x-mount.mkdir --bind $MOUNTPOINT $TS_NOEXIST >> $TS_OUTPUT 2>&1 && echo "successfully mounted" >> $TS_OUTPUT |