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 | 9 +++++++-- tests/xfs/292.out | 10 ++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/tests/xfs/292 b/tests/xfs/292 index 2910118..b4a392f 100755 --- a/tests/xfs/292 +++ b/tests/xfs/292 @@ -53,9 +53,14 @@ 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 | _filter_mkfs 2> $tmp.mkfs > /dev/null +grep -E 'ddev|isize|agcount|agsize' $tmp.mkfs | \ + sed -e "s:$fsfile:FILENAME: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 | _filter_mkfs 2> $tmp.mkfs > /dev/null +grep -E 'ddev|isize|agcount|agsize' $tmp.mkfs | \ + sed -e "s:$fsfile:FILENAME:g" rm -f $fsfile diff --git a/tests/xfs/292.out b/tests/xfs/292.out index fd88105..2837d74 100644 --- a/tests/xfs/292.out +++ b/tests/xfs/292.out @@ -1,5 +1,11 @@ QA output created by 292 mkfs.xfs without geometry -meta-data=FILENAME isize=256 agcount=4, agsize=16777216 blks +ddev=FILENAME +isize=256 +agcount=4 +agsize=16777216 mkfs.xfs with cmdline geometry -meta-data=FILENAME isize=256 agcount=16, agsize=4194304 blks +ddev=FILENAME +isize=256 +agcount=16 +agsize=4194304 -- 1.9.3 -- 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
