On Thu, Mar 3, 2016 at 6:16 PM, David Sterba <dsterba@xxxxxxxx> wrote:
> The error message in newer btrfs utilities contains name of the
> property, we want to filter it out so it matches golden output. There's
> an optional parameter with property name that is matched against the
> command output.
>
> Signed-off-by: David Sterba <dsterba@xxxxxxxx>
Reviewed-by: Filipe Manana <fdmanana@xxxxxxxx>
> ---
> common/filter.btrfs | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/common/filter.btrfs b/common/filter.btrfs
> index 9bb64792f14f..380454399834 100644
> --- a/common/filter.btrfs
> +++ b/common/filter.btrfs
> @@ -68,5 +68,17 @@ _filter_btrfs_subvol_delete()
>
> }
>
> +# filter name of the property from the output, optionally verify against $1
> +# recognized message(s):
> +# "object is not compatible with property: label"
> +_filter_btrfs_prop_error()
> +{
> + if ! [ -z "$1" ]; then
> + sed -e "s/\(compatible with property\): $1/\1/"
> + else
> + sed -e "s/^\(.*compatible with property\).*/\1/"
> + fi
> +}
> +
> # make sure this script returns success
> /bin/true
> --
> 1.8.4.5
>
> --
> 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
--
Filipe David Manana,
"Reasonable men adapt themselves to the world.
Unreasonable men adapt the world to themselves.
That's why all progress depends on unreasonable men."
--
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
