xfs
[Top] [All Lists]

Re: [PATCH] xfstests: handle xfs_quota output w/ long devicenames

To: Eric Sandeen <sandeen@xxxxxxxxxx>
Subject: Re: [PATCH] xfstests: handle xfs_quota output w/ long devicenames
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Thu, 10 Oct 2013 09:12:16 +1100
Cc: xfs-oss <xfs@xxxxxxxxxxx>
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <5251E83B.8060605@xxxxxxxxxx>
References: <5251E83B.8060605@xxxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
On Sun, Oct 06, 2013 at 05:46:19PM -0500, Eric Sandeen wrote:
> Long device names may be split onto their own line
> on quota output:
> 
> Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
> /dev/mapper/my-very-very-very-long-devicename
>                 48M      0      0  00 [------] /mnt/scratch
> 
> which breaks tests that capture quota output - currently,
> only xfs/107.

xfs/108?

> Add a _filter_quota() which fixes this.

Is this necessary for any other tests? I notice some have their own
filters (e.g. xfs/106), but AFAICT none of them handle wraped
lines...

> Signed-off-by: Eric Sandeen <sandeen@xxxxxxxxxx>
> ---
> 
> 
> 
> diff --git a/common/filter b/common/filter
> index 066b353..a0d9d2a 100644
> --- a/common/filter
> +++ b/common/filter
> @@ -240,6 +240,15 @@ _filter_spaces()
>         sed -e 's/ [ ]*/ /g'
>  }
>  
> +_filter_quota()
> +{
> +     # Long dev name might be split onto its own line; last
> +     # seds remove that newline if present
> +     _filter_scratch | _filter_test_dir | _filter_spaces | \
> +     sed -e 'N;s/SCRATCH_DEV\n/SCRATCH_DEV/g' | \
> +     sed -e 'N;s/TEST_DEV\n/TEST_DEV/g'

A bit messy, but given that we need to filter SCRATCH_MNT and
TEST_DIR as well I can't see a much more obvious way to do it.
I can think of plenty of line noise equivalents that are much
shorter and more concise, but the comments explaining it would be
longer than the above method. ;) So:

Reviewed-by: Dave Chinner <dchinner@xxxxxxxxxx>

Cheers,

Dave.
-- 
Dave Chinner
david@xxxxxxxxxxxxx

<Prev in Thread] Current Thread [Next in Thread>