Re: [PATCH] fstests: common: Enhance _exclude_scratch_mount_option to handle multiply options and generic fs type

On Tue, Sep 06, 2016 at 12:20:39PM +0800, Eryu Guan wrote:

On Mon, Sep 05, 2016 at 03:13:33PM +0800, Qu Wenruo wrote:

quoted

Enhance _exclude_scratch_mount_option() function to get real mount
options from $MOUNT_OPTIONS.

This seems unnecessarily complex to me.

quoted

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.

quoted

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?

quoted

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?

Much simpler, easier to understand and tell why the test did not
run.

Cheers,

Dave.
-- 
Dave Chinner
david@fromorbit.com