xfstest: fix filtering in 206 for ftype and projid32bit

xfs/206 displays the output for mkfs.xfs, xfs_growfs and xfs_info.
Change the filtering to hide the new output for the field type
feature.

While cleaning up the ftype output, also clean up the projid32bit
output in xfs_growfs and xfs_info.

Signed-off-by: Mark Tinguely <tinguely@sgi.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Mark Tinguely
2013-10-24 21:56:42 +00:00
committed by Rich Johnston
parent fa74b4bdba
commit 812838f86d
+5
View File
@@ -77,6 +77,7 @@ mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 $tmpf
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
@@ -86,6 +87,8 @@ echo "=== xfs_growfs ==="
xfs_growfs $tmpdir \
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
# and double-check the new geometry
@@ -93,6 +96,8 @@ echo "=== xfs_info ==="
xfs_info $tmpdir \
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
# _cleanup cleans up for us