[PATCH 1/2] filter.btrfs: new filter for property messages

David Sterba
2016-03-03T18:16:53Z

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@suse.com>
---
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