ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tests: make mount tests backwardly compatible with deprecated-mount/ 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2013-04-25 11:07:05 +02:00
parent 119c7125cb
commit d426ddbd5f
3 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tests/ts/mount/shared-subtree
View File

@ -58,20 +58,25 @@ mkfs.ext3 $DEVICE &> /dev/null || ts_die "Cannot make ext3 on $DEVICE" $DEVICE
ts_device_has "TYPE" "ext3" $DEVICE || ts_die "Cannot find ext3 on $DEVICE" $DEVICE
ts_init_subtest "mount-private"
$TS_CMD_MOUNT --make-private --make-unbindable \
$DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
$TS_CMD_UMOUNT $MOUNTPOINT
ts_finalize_subtest
# multiple propagation flags for one mount(8) call is unsupported
# by old mount-deprecated/mount
$TS_CMD_MOUNT -V | grep -q libmount
if [ $? -eq 0 ]; then
ts_init_subtest "mount-private-ro"
$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
$TS_CMD_UMOUNT $MOUNTPOINT
ts_finalize_subtest
ts_init_subtest "mount-private"
$TS_CMD_MOUNT --make-private --make-unbindable \
$DEVICE $MOUNTPOINT >> $TS_OUTPUT 2>&1
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
$TS_CMD_UMOUNT $MOUNTPOINT
ts_finalize_subtest
ts_init_subtest "mount-private-ro"
$TS_CMD_MOUNT $DEVICE $MOUNTPOINT -o ro,private >> $TS_OUTPUT 2>&1
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o PROPAGATION >> $TS_OUTPUT
$TS_CMD_FINDMNT -nr --target $MOUNTPOINT -o VFS-OPTIONS >> $TS_OUTPUT
$TS_CMD_UMOUNT $MOUNTPOINT
ts_finalize_subtest
fi
ts_device_deinit $DEVICE
rmdir $MOUNTPOINT

3
tests/ts/mount/umount-alltargets
View File

@ -9,6 +9,9 @@ TS_DESC="umount-all-targets"
ts_init "$*"
ts_skip_nonroot
$TS_CMD_UMOUNT --help | grep -q all-targets
[ $? -eq 1 ] && ts_skip "all-targets unsupported"
DEVICE=$(ts_scsi_debug_init dev_size_mb=50)
ts_log "Create partitions"

3
tests/ts/mount/umount-recursive
View File

@ -9,6 +9,9 @@ TS_DESC="umount-recursive"
ts_init "$*"
ts_skip_nonroot
$TS_CMD_UMOUNT --help | grep -q recursive
[ $? -eq 1 ] && ts_skip "recursive unsupported"
ts_log "Init device"
DEVICE=$(ts_scsi_debug_init dev_size_mb=50)