[PATCH] xfstests: more careful size grep in 256

[PATCH] xfstests: more careful size grep in 256

[Eric Sandeen]

Removing the "-F" flag in xfs_io changed stat output.

Before the change when -F was used, whether or not the file
was on xfs, it skipped the extra FSGEOM call.  Now that -F is 
removed, it calls FSGEOM if the file is on an xfs fs.  The "size" 
grep in test 256 was a bit too loose and matched 2 lines if the
FSGEOM output was present, breaking the test.

A more specific grep for stat.size fixes this.

Reported-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
---

diff --git a/256 b/256
index 283c7f2..ffe172a 100755
--- a/256
+++ b/256
@@ -98,7 +98,7 @@ _fill_fs() {
 
 		if [ -f $dir/$file_count.bin ]
 		then
-			bytes_written=`$XFS_IO_PROG -F -c "stat"  $dir/$file_count.bin | grep size | cut -d ' ' -f3`
+			bytes_written=`$XFS_IO_PROG -F -c "stat"  $dir/$file_count.bin | grep stat.size | cut -d ' ' -f3`
 		fi
 
 		# If there was no room to make the file,

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

Re: [PATCH] xfstests: more careful size grep in 256

[Christoph Hellwig]

On Tue, Feb 14, 2012 at 10:26:01AM -0800, Eric Sandeen wrote:
> Removing the "-F" flag in xfs_io changed stat output.
> 
> Before the change when -F was used, whether or not the file
> was on xfs, it skipped the extra FSGEOM call.  Now that -F is 
> removed, it calls FSGEOM if the file is on an xfs fs.  The "size" 
> grep in test 256 was a bit too loose and matched 2 lines if the
> FSGEOM output was present, breaking the test.
> 
> A more specific grep for stat.size fixes this.

Looks good,

Reviewed-by: Christoph Hellwig <hch@lst.de>

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