fstests: introduce _exclude_scratch_mount_option helper

Some tests require that there's no certain mount option in
MKFS_OPTIONS, so introduce a new helper
_exclude_scratch_mount_option() to do the check on $MOUNT_OPTIONS.

Also convert generic/192 and xfs/134 to use this helper.

Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
This commit is contained in:
Eryu Guan
2016-06-23 14:09:46 +08:00
parent bbb351f8e5
commit 497363b789
3 changed files with 12 additions and 16 deletions
+3 -5
View File
@@ -50,6 +50,9 @@ _supported_os Linux IRIX
_require_test
_require_xfs_quota
# we can't run with group quotas
_exclude_scratch_mount_option "gquota"
_exclude_scratch_mount_option "grpquota"
dir=$SCRATCH_MNT/project
@@ -70,11 +73,6 @@ _scratch_mkfs_xfs >/dev/null 2>&1
#if pquota's already in mount options then we dont need to enable
# we can't run with group quotas
if ( `echo $MOUNT_OPTIONS | grep -q gquota` || `echo $MOUNT_OPTIONS | grep -q grpquota` )
then
_notrun "Can't run with group quotas enabled"
fi
EXTRA_MOUNT_OPTIONS="-o pquota"
if ! _scratch_mount "$EXTRA_MOUNT_OPTIONS" >$tmp.out 2>&1