On Wed, Jun 25, 2014 at 07:02:26PM +0800, Xing Gu wrote: > In mkfs.xfs, it uses left-align and fixed width format when outputting > device name, so variable length of devicename makes different space's > number between "meta-data=devicename" and "isize". But in the expected > output, the space' number between them is fixed. This behavior often > results in the case failure. So fix the format of expected message. > > Signed-off-by: Xing Gu <gux.fnst@xxxxxxxxxxxxxx> > --- > tests/xfs/292 | 6 ++++-- > tests/xfs/292.out | 4 ++-- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/tests/xfs/292 b/tests/xfs/292 > index 2910118..1762215 100755 > --- a/tests/xfs/292 > +++ b/tests/xfs/292 > @@ -53,9 +53,11 @@ rm -f $fsfile > $XFS_IO_PROG -f -c "truncate 256g" $fsfile > > echo "mkfs.xfs without geometry" > -mkfs.xfs -f $fsfile 2>&1 | sed -e "s:$fsfile:FILENAME:g" | grep meta-data > +mkfs.xfs -f $fsfile 2>&1 | grep meta-data | \ > + sed -e "s:$fsfile:FILENAME:g" -e "s:[ ][ ]*: :g" > echo "mkfs.xfs with cmdline geometry" > -mkfs.xfs -f -d su=16k,sw=5 $fsfile 2>&1 | sed -e "s:$fsfile:FILENAME:g" | grep meta-data > +mkfs.xfs -f -d su=16k,sw=5 $fsfile 2>&1 | grep meta-data | \ > + sed -e "s:$fsfile:FILENAME:g" -e "s:[ ][ ]*: :g" > > rm -f $fsfile I think this test could be better rewritten to use _filter_mkfs. ie. mkfs.xfs -f $fsfile | _filter_mkfs 2> $tmp.mkfs > /dev/null grep ddev $tmp.mkfs So that it uses the generic mkfs filter and pulls just the info needed from the variable file that the filter produces. That way we only have to update one filter whenever the mkfs output format changes. Cheers, Dave. -- Dave Chinner david@xxxxxxxxxxxxx -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
