[PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[Mark Tinguely]

[-- Attachment #1: xfstests-fix-206-ftype.patch --]
[-- Type: text/plain, Size: 1562 bytes --]

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>
---
 tests/xfs/206 |    5 +++++
 1 file changed, 5 insertions(+)

Index: b/tests/xfs/206
===================================================================
--- a/tests/xfs/206
+++ 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
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[Dave Chinner]

On Thu, Oct 24, 2013 at 04:56:42PM -0500, Mark Tinguely wrote:
> 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.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[Mark Tinguely]

On 10/24/13 17:11, Dave Chinner wrote:
> On Thu, Oct 24, 2013 at 04:56:42PM -0500, Mark Tinguely wrote:
>> 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.

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

--Mark.

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[Dave Chinner]

On Thu, Oct 24, 2013 at 05:46:55PM -0500, Mark Tinguely wrote:
> On 10/24/13 17:11, Dave Chinner wrote:
> >On Thu, Oct 24, 2013 at 04:56:42PM -0500, Mark Tinguely wrote:
> >>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.
> 
> 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.
-- 
Dave Chinner
david@fromorbit.com

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs

Re: [PATCH] xfstest: fix filtering in 206 for ftype and projid32bit

[Rich Johnston]

This has been committed:

Thanks
--Rich

commit 812838f86d57b1182bec62b5d472037392ab7966
Author: Mark Tinguely <tinguely@sgi.com>
Date:   Thu Oct 24 21:56:42 2013 +0000

     xfstest: fix filtering in 206 for ftype and projid32bit

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs