From: Eryu Guan <eguan@redhat.com>
Date: Fri, 4 Nov 2016 16:16:10 +0000 (+0800)
Subject: xfs/021: filter out detailed array element info from xfs_db
X-Git-Tag: v2022.05.01~2304
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=00d42708c2231ddd2953d23d79d24d32f1b62661;p=xfstests-dev.git

xfs/021: filter out detailed array element info from xfs_db

Starting from xfsprogs commit 384283555871 ("xfs_db: print one array
element per line"), xfs_db prints one array element per line. This
breaks the filter in xfs/021, which now fails as:

  hdr.freemap[0-2] = [base,size] [FREEMAP..]
 +0:[104,1892]
 +1:[0,0]
 +2:[0,0]
  entries[0-2] = [hashval,nameidx,incomplete,root,local] [ENTRIES..]

So we have extra lines that need to be filtered out,

Reviewed-by: Zorro Lang <zlang@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>
---

diff --git a/tests/xfs/021 b/tests/xfs/021
index 67a4346b..0471b953 100755
--- a/tests/xfs/021
+++ b/tests/xfs/021
@@ -151,7 +151,7 @@ s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/;
 s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/;
 s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/;
 s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/;
-	print;'
+	print unless /^\d+:\[.*/;'
 
 echo "*** done"
 exit