From c0c26cecab8a39e9c16ac57018a51e8f021dcf06 Mon Sep 17 00:00:00 2001 From: "Darrick J. Wong" Date: Thu, 9 Nov 2017 16:44:34 -0800 Subject: [PATCH] common/fuzzy: ignore padding fields on xfs Padding fields are never checked and can have arbitrary values (if we ever put them to use there'll be a feature flag) so there's no point in fuzz-testing them. Signed-off-by: Darrick J. Wong Reviewed-by: Eryu Guan Signed-off-by: Eryu Guan --- common/fuzzy | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/common/fuzzy b/common/fuzzy index 86492687..3d86e1c8 100644 --- a/common/fuzzy +++ b/common/fuzzy @@ -79,6 +79,14 @@ _scratch_scrub() { esac } +# Filter out any keys with an array index >= 10, collapse any array range +# ("[1-195]") to the first item, and ignore padding fields. +__filter_xfs_db_keys() { + sed -e '/\([a-z]*\)\[\([0-9][0-9]\+\)\].*/d' \ + -e 's/\([a-zA-Z0-9_]*\)\[\([0-9]*\)-[0-9]*\]/\1[\2]/g' \ + -e '/pad/d' +} + # Filter the xfs_db print command's field debug information # into field name and type. __filter_xfs_db_print_fields() { @@ -87,15 +95,13 @@ __filter_xfs_db_print_fields() { filter='^' fi grep ' = ' | while read key equals value; do - # Filter out any keys with an array index >= 10, and - # collapse any array range ("[1-195]") to the first item. - fuzzkey="$(echo "${key}" | sed -e '/\([a-z]*\)\[\([0-9][0-9]\+\)\].*/d' -e 's/\([a-zA-Z0-9_]*\)\[\([0-9]*\)-[0-9]*\]/\1[\2]/g')" + fuzzkey="$(echo "${key}" | __filter_xfs_db_keys)" if [ -z "${fuzzkey}" ]; then continue elif [[ "${value}" == "["* ]]; then echo "${value}" | sed -e 's/^.//g' -e 's/.$//g' -e 's/,/\n/g' | while read subfield; do echo "${fuzzkey}.${subfield}" - done + done | __filter_xfs_db_keys else echo "${fuzzkey}" fi -- 2.30.2