| Message ID | 1478752183-27499-1-git-send-email-eguan@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Nov 10, 2016 at 12:29:43PM +0800, Eryu Guan wrote: > 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, > > Signed-off-by: Eryu Guan <eguan@redhat.com> > --- V2 looks better to me, Reviewed-by: Zorro Lang <zlang@redhat.com> > - be more precise on matching the array output, address Zorro's comment > > tests/xfs/021 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tests/xfs/021 b/tests/xfs/021 > index 67a4346..0471b95 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 > -- > 2.7.4 > > -- > To unsubscribe from this list: send the line "unsubscribe fstests" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Looks good,
Reviewed-by: Christoph Hellwig <hch@lst.de>
--
To unsubscribe from this list: send the line "unsubscribe fstests" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/tests/xfs/021 b/tests/xfs/021 index 67a4346..0471b95 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
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, Signed-off-by: Eryu Guan <eguan@redhat.com> --- - be more precise on matching the array output, address Zorro's comment tests/xfs/021 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)