misc: force the exact quota options coded into the test

Several tests require setting exactly the quota mount options that are
encoded in the test.  Unfortunately, quota mount options set by the user
in MOUNT_OPTIONS can turn on other quota types, which causes the golden
outputs to be off for various reasons (quota report output, behavior
changes, etc.)

So use _qmount_option to delete all the quota mount options in these
tests so that the test itself can run with exactly the config for which
it was written.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Darrick J. Wong
2018-11-01 16:19:46 -07:00
committed by Eryu Guan
parent f1e94da67c
commit 89985c90ea
5 changed files with 18 additions and 0 deletions
+3
View File
@@ -99,6 +99,9 @@ rm -f $seqres.full
grace=2
# Test only the quota type specified in each _scratch_mount clause below.
_qmount_option 'defaults'
_scratch_mkfs >> $seqres.full 2>&1
_scratch_mount "-o usrquota,grpquota"
BLOCK_SIZE=$(_get_file_block_size $SCRATCH_MNT)
+4
View File
@@ -25,12 +25,16 @@ _cleanup()
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
. ./common/quota
# real QA test starts here
_supported_fs xfs
_supported_os Linux
_require_scratch
# norecovery mounts do not succeed with quotas eanbled, so shut them off
_qmount_option "defaults"
echo "Silence is golden"
_scratch_mkfs_sized $((512 * 1024 * 1024)) >$seqres.full
+3
View File
@@ -36,6 +36,9 @@ _supported_os Linux
_require_scratch
_require_xfs_quota
# Only mount with the quota options we specify below
_qmount_option "defaults"
_scratch_mkfs >/dev/null 2>&1
_scratch_mount "-o uquota"
_scratch_unmount
+5
View File
@@ -24,6 +24,7 @@ _cleanup()
# get standard environment, filters and checks
. ./common/rc
. ./common/filter
. ./common/quota
# remove previous $seqres.full before test
rm -f $seqres.full
@@ -43,6 +44,10 @@ _disable_dmesg_check
_require_xfs_mkfs_crc
_scratch_mkfs -m crc=0 > $seqres.full 2>&1
# The files that EIO in the golden output changes if we have quotas enabled
# so leave it off.
_qmount_option "defaults"
# corrupt an inode in the root inode chunk
root_ino=$(_scratch_xfs_get_metadata_field 'rootino' 'sb 0')
corrupt_ino=$((root_ino + 15))
+3
View File
@@ -36,6 +36,9 @@ _supported_os Linux
_require_scratch
_require_quota
# Only mount with the specific quota options mentioned below
_qmount_option "defaults"
echo "Silence is golden."
# create scratch filesystem