| Message ID | a359b1fc-6f31-4a9b-08e5-ed62078cdce8@sandeen.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, May 25, 2018 at 09:00:59AM -0500, Eric Sandeen wrote: > The pending common geometry printing function has removed the fiddly > little differences between the various utilities, so now we'll need > to accommodate that in xfs/206, which looks at mkfs & growfs output. > > all now print "internal log" vs. just "internal" > ascii-ci now always has a "," after it > > Signed-off-by: Eric Sandeen <sandeen@redhat.com> > --- Reviewed-by: Bill O'Donnell <billodo@redhat.com> > > diff --git a/tests/xfs/206 b/tests/xfs/206 > index 01782b7b..d5edf1ae 100755 > --- a/tests/xfs/206 > +++ b/tests/xfs/206 > @@ -73,13 +73,16 @@ echo "=== truncate file ===" > dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \ > || _fail "!!! failed to truncate loopback file to correct size" > +# mkfs/growfs output has changed slightly over the years, this distills > +# it down to a common set of output parameters we care about > mkfs_filter() > { > sed -e 's/meta-data=[^ ]*/meta-data=FILE/' \ > -e 's/ *isize=[0-9]* / isize=N /' \ > -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \ > + -e "s/internal log/internal /" \ > -e "s/, projid32bit=[0-9]//" \ > - -e "s/ ftype=[0-9]//" \ > + -e "s/,\? ftype=[0-9]//" \ > -e "/.*reflink=/d" \ > -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \ > -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ > diff --git a/tests/xfs/206.out b/tests/xfs/206.out > index 2db839d0..be335600 100644 > --- a/tests/xfs/206.out > +++ b/tests/xfs/206.out > @@ -6,7 +6,7 @@ meta-data=FILE isize=N agcount=52, agsize=76288719 blks > data = bsize=4096 blocks=3905982455, imaxpct=5 > = sunit=0 swidth=0 blks > naming =version 2 bsize=4096 ascii-ci=0 > -log =internal log bsize=4096 blocks=XXXXX, version=2 > +log =internal bsize=4096 blocks=XXXXX, version=2 > = sectsz=512 sunit=0 blks > realtime =none extsz=4096 blocks=0, rtextents=0 > === xfs_growfs === > > -- > 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
diff --git a/tests/xfs/206 b/tests/xfs/206 index 01782b7b..d5edf1ae 100755 --- a/tests/xfs/206 +++ b/tests/xfs/206 @@ -73,13 +73,16 @@ echo "=== truncate file ===" dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \ || _fail "!!! failed to truncate loopback file to correct size" +# mkfs/growfs output has changed slightly over the years, this distills +# it down to a common set of output parameters we care about mkfs_filter() { sed -e 's/meta-data=[^ ]*/meta-data=FILE/' \ -e 's/ *isize=[0-9]* / isize=N /' \ -e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \ + -e "s/internal log/internal /" \ -e "s/, projid32bit=[0-9]//" \ - -e "s/ ftype=[0-9]//" \ + -e "s/,\? ftype=[0-9]//" \ -e "/.*reflink=/d" \ -e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \ -e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \ diff --git a/tests/xfs/206.out b/tests/xfs/206.out index 2db839d0..be335600 100644 --- a/tests/xfs/206.out +++ b/tests/xfs/206.out @@ -6,7 +6,7 @@ meta-data=FILE isize=N agcount=52, agsize=76288719 blks data = bsize=4096 blocks=3905982455, imaxpct=5 = sunit=0 swidth=0 blks naming =version 2 bsize=4096 ascii-ci=0 -log =internal log bsize=4096 blocks=XXXXX, version=2 +log =internal bsize=4096 blocks=XXXXX, version=2 = sectsz=512 sunit=0 blks realtime =none extsz=4096 blocks=0, rtextents=0 === xfs_growfs ===
The pending common geometry printing function has removed the fiddly little differences between the various utilities, so now we'll need to accommodate that in xfs/206, which looks at mkfs & growfs output. all now print "internal log" vs. just "internal" ascii-ci now always has a "," after it Signed-off-by: Eric Sandeen <sandeen@redhat.com> --- -- 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