xfs
[Top] [All Lists]

Re: [PATCH] xfstests generic/260: get correct trimmed bytes

To: Eryu Guan <eguan@xxxxxxxxxx>
Subject: Re: [PATCH] xfstests generic/260: get correct trimmed bytes
From: Dave Chinner <david@xxxxxxxxxxxxx>
Date: Fri, 4 Oct 2013 11:07:37 +1000
Cc: xfs@xxxxxxxxxxx
Delivered-to: xfs@xxxxxxxxxxx
In-reply-to: <1380801437-1191-1-git-send-email-eguan@xxxxxxxxxx>
References: <1380801437-1191-1-git-send-email-eguan@xxxxxxxxxx>
User-agent: Mutt/1.5.21 (2010-09-15)
On Thu, Oct 03, 2013 at 07:57:17PM +0800, Eryu Guan wrote:
> Newer fstrim(1) reports trimmed bytes differently, e.g.
> 
> new fstrim: /mnt/ext4: 9.7 GiB (10411118592 bytes) trimmed
> old fstrim: /mnt/ext4: 10411118592 bytes were trimmed
> 
> generic/260 reports syntax error
> 
>     +./tests/generic/260: line 111: [: 9.7: integer expression expected
>     +./tests/generic/260: line 121: [: 9.7: integer expression expected
>     +./tests/generic/260: line 183: [: 9.7: integer expression expected
> 
> Fix it so 260 passes with both old and new fstrim.
> 
> Signed-off-by: Eryu Guan <eguan@xxxxxxxxxx>
> ---
>  tests/generic/260 | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/tests/generic/260 b/tests/generic/260
> index dc8b822..bc9eb3b 100755
> --- a/tests/generic/260
> +++ b/tests/generic/260
> @@ -104,9 +104,8 @@ _scratch_mount
>  # This is a bit fuzzy, but since the file system is fresh
>  # there should be at least (fssize/2) free space to trim.
>  # This is supposed to catch wrong FITRIM argument handling
> -out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT)
> -nopref=${out##*: }
> -bytes=${nopref%% *}
> +out=$($FSTRIM_PROG -v -o10M $SCRATCH_MNT | egrep -o "[0-9]+ bytes")
> +bytes=${out%% *}

Can you add this as a "_filter_fstrim" function to common/filter
with a comment explaining what version of fstrim the output changed
in?

Cheers,

Dave.
-- 
Dave Chinner
david@xxxxxxxxxxxxx

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