Skip to contentSkip to conversation

xfstest: fix filtering in 206 for ftype and projid32bit

PATCH In review Mark Tinguely 3 participants 5 messages Oct 24, 2013 – Nov 10, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

---
 tests/xfs/206 |    5 +++++
 1 file changed, 5 insertions(+)
tests/xfs/206 +5 -0
Index: b/tests/xfs/206
===================================================================
@@ -77,6 +77,7 @@ mkfs.xfs -f -bsize=4096 -dagsize=7628871
 	| 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

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#1 lore raw
Quoted 6 lines · Mark Tinguely

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.

What about the _filter_mkfs function that other tests use?

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs
#2 lore raw
Quoted 5 lines · Dave Chinner
Quoted 4 lines · Mark Tinguely

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.

Quoted 8 lines
Quoted 2 lines

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

What about the _filter_mkfs function that other tests use?

Cheers,

Dave.

From what I can tell, it does not need changing.

--Mark.

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs

#3 lore raw
Quoted 9 lines · Mark Tinguely
Quoted 8 lines · Dave Chinner
Quoted 6 lines · Mark Tinguely

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.

Quoted 7 lines
Quoted 5 lines

What about the _filter_mkfs function that other tests use?

Cheers,

Dave.

From what I can tell, it does not need changing.

We really should be exporting the values as shell variables to stderr for any test that wants to use them. We don't need to output them to stdout at this point (as that will break all the golden images), but all the mkfs config values should be accessible from the filter.

i.e. _filter_mkfs is infrastructure and when new things are added, the infrastructure needs to be updated as well. IOWs, this should work after you've added support for ftype to xfstests:

_scratch_mkfs | _mkfs_filter 2> $tmp.mkfs > /dev/null . $tmp.mkfs

if [ $nftype -eq 1 ]; then

	.....

Cheers,

Dave.

Signature · 7 lines
Dave Chinner
[email protected]

_______________________________________________
xfs mailing list
[email protected]
http://oss.sgi.com/mailman/listinfo/xfs