From: Dave Chinner <david@fromorbit.com>
To: Eric Sandeen <sandeen@redhat.com>
Cc: xfs-oss <xfs@oss.sgi.com>
Subject: Re: [PATCH] xfstests: handle xfs_quota output w/ long devicenames
Date: Thu, 10 Oct 2013 09:12:16 +1100 [thread overview]
Message-ID: <20131009221216.GN4446@dastard> (raw)
In-Reply-To: <5251E83B.8060605@redhat.com>
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@redhat.com>
> ---
>
>
>
> 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@redhat.com>
Cheers,
Dave.
--
Dave Chinner
david@fromorbit.com
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next prev parent reply other threads:[~2013-10-09 22:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-06 22:46 [PATCH] xfstests: handle xfs_quota output w/ long devicenames Eric Sandeen
2013-10-09 22:12 ` Dave Chinner [this message]
2013-10-16 20:33 ` Rich Johnston
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20131009221216.GN4446@dastard \
--to=david@fromorbit.com \
--cc=sandeen@redhat.com \
--cc=xfs@oss.sgi.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox