xfs/292: fix format of expected message

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@cn.fujitsu.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>

diff --git a/tests/xfs/292 b/tests/xfs/292
index 2910118bc25b83426b48e7db707ca0fb726adb0b..b4a392f0fad4595da374d1237727b52ea8f1731b 100755 (executable)
--- 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 fd88105c2fa25d1b020e96271de5a0ae4ebde05b..2837d74a7b073ef2ad2b52fd81478b568463448f 100644 (file)
--- 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