On Mon, Sep 05, 2016 at 03:13:33PM +0800, Qu Wenruo wrote:
> Enhance _exclude_scratch_mount_option() function to get real mount
> options from $MOUNT_OPTIONS.
This seems unnecessarily complex to me.
>
> Now it can understand and extract real mount option from string like
> "-o opt1,opt2 -oopt3".
> Furthermore, it doesn't use grep method, which can lead to false alert
> for options like inode_cache and noinode_cache.
> It now do compare with the first n characters of the prohibited list,
> so it can handle "data=" and above "no" prefix well.
I think we can fix it by adding "-w" option to grep, and replacing
"data=" with "data", "=" seems not necessary.
>
> And add a new parameter, 'fstype' for _exclude_scratch_mount_option().
> So for generic test cases, it can still prohibit mount options for given
> fs(mainly for btrfs though)
This requires every caller of this helper provides an additional fstype
argument, and in most cases this argument is not useful (generic or
current FSTYP). If btrfs needs to be handled differently, how about
checking the fstype in the test and adding additional mount option rules
if fstype is btrfs?
>
> Finally, allow it to accept multiple options at the same time.
> No need for multiple _exclude_scratch_mount_option lines now
So _exclude_scratch_mount_option is simply:
# skip test if MOUNT_OPTIONS contains the given mount options
_exclude_scratch_mount_option()
{
for opt in $*; do
if echo $MOUNT_OPTIONS | grep -qw "$opt"; then
_notrun "mount option \"$opt\" not allowed in this test"
fi
done
}
(Note that the comment in current code is wrong, MKFS_OPTIONS should be
MOUNT_OPTIONS)
What do you and/or other people think?
Thanks,
Eryu
>
> Signed-off-by: Qu Wenruo <quwenruo@xxxxxxxxxxxxxx>
> ---
> common/rc | 41 ++++++++++++++++++++++++++++++++++++++---
> tests/ext4/271 | 6 ++----
> tests/xfs/134 | 3 +--
> 3 files changed, 41 insertions(+), 9 deletions(-)
>
> diff --git a/common/rc b/common/rc
> index 04039a4..8fca637 100644
> --- a/common/rc
> +++ b/common/rc
> @@ -3183,11 +3183,46 @@ _require_cloner()
> _notrun "cloner binary not present at $CLONER_PROG"
> }
>
> -# skip test if MKFS_OPTIONS contains the given string
> +# Normalize mount options from global $MOUNT_OPTIONS
> +# Will convert "-o options1,options2 -ooptions3" into
> +# "options1 options2 options3" for easy access
> +_normalize_mount_options()
> +{
> + echo $MOUNT_OPTIONS | sed -n 's/-o\s*\(\S*\)/\1/gp' |\
> + sed 's/,/ /g'
> +}
> +
> +# Helper for _exclude_scratch_mount_option , check if exclusive mount option $1
> +# is in the custom mount options
> +_check_one_exclusive_option()
> +{
> + excl_opt=$1
> + shift
> + mnt_opts=$*
> + excl_len=${#excl_opt}
> +
> + for n in $mnt_opts; do
> + # Handle mount option like "data="
> + sub_str=$(expr substr $n 1 ${excl_len})
> + if [ $sub_str == $excl_opt ]; then
> + _notrun "mount option \"$n\" not allowed in this test"
> + fi
> + done
> +}
> +
> +# skip test if custom MOUNT_OPTIONS contains prohibited mount
> +# options
> _exclude_scratch_mount_option()
> {
> - if echo $MOUNT_OPTIONS | grep -q "$1"; then
> - _notrun "mount option \"$1\" not allowed in this test"
> + fstype=$1
> + shift
> +
> + normalized=$(_normalize_mount_options)
> + if [ $fstype == "generic" -o $fstype = $FSTYP ]; then
> + while [ $# -gt 1 ]; do
> + _check_one_exclusive_option $1 $normalized
> + shift
> + done
> fi
> }
>
> diff --git a/tests/ext4/271 b/tests/ext4/271
> index 8674090..f3a99b7 100755
> --- a/tests/ext4/271
> +++ b/tests/ext4/271
> @@ -41,10 +41,8 @@ _supported_os Linux
> _require_scratch
> # this test needs no journal to be loaded, skip on journal related mount
> # options, otherwise mount would fail with "-o noload" mount option
> -_exclude_scratch_mount_option "data="
> -_exclude_scratch_mount_option "commit="
> -_exclude_scratch_mount_option "journal_checksum"
> -_exclude_scratch_mount_option "journal_async_commit"
> +_exclude_scratch_mount_option ext4 "data=" "commit=" "journal_checksum" \
> + "journal_async_commit"
>
> rm -f $seqres.full
> _scratch_mkfs_sized $((128 * 1024 * 1024)) >> $seqres.full 2>&1
> diff --git a/tests/xfs/134 b/tests/xfs/134
> index b3a1107..ca4a73d 100755
> --- a/tests/xfs/134
> +++ b/tests/xfs/134
> @@ -51,8 +51,7 @@ _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"
> +_exclude_scratch_mount_option xfs "gquota" "grpquota"
>
> dir=$SCRATCH_MNT/project
>
> --
> 2.7.4
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe fstests" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
