[PATCH V3] xfstests: don't remove trailing zeros from integers

[PATCH V3] xfstests: don't remove trailing zeros from integers

[Eric Whitney]

_within_tolerance strips trailing zeros from the min and max range
values it outputs.  This leads to damage if the min or max value is
an integer containing trailing zeros rather than a real number with
a fractional part containing trailing zeros. Xfstest 289 can exhibit
this problem when its input is out of range.  Modify the code so it
will only remove trailing zeros found after a decimal point.

V1->V2: Remove decimal points not followed by digits
V2->V3: Per Dave Chinner, simplify by using multiple sed expressions

Signed-off-by: Eric Whitney <enwlinux@gmail.com>
---
 common.filter |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common.filter b/common.filter
index 9e4c90c..c854a98 100644
--- a/common.filter
+++ b/common.filter
@@ -106,8 +106,10 @@ EOF
 
   # fix up min, max precision for output
   # can vary for 5.3, 6.2
-  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
-  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
+
+  # remove any trailing zeroes from min, max if they have fractional parts
+  _min=`echo $_min | sed -e '/\./s/0*$//' -e 's/\.$//'`
+  _max=`echo $_max | sed -e '/\./s/0*$//' -e 's/\.$//'`
 
   if [ $_in_range -eq 1 ] 
   then
-- 
1.7.10.4

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

Re: [PATCH V3] xfstests: don't remove trailing zeros from integers

[Eric Sandeen]

On 3/5/13 1:17 PM, Eric Whitney wrote:
> _within_tolerance strips trailing zeros from the min and max range
> values it outputs.  This leads to damage if the min or max value is
> an integer containing trailing zeros rather than a real number with
> a fractional part containing trailing zeros. Xfstest 289 can exhibit
> this problem when its input is out of range.  Modify the code so it
> will only remove trailing zeros found after a decimal point.
> 
> V1->V2: Remove decimal points not followed by digits
> V2->V3: Per Dave Chinner, simplify by using multiple sed expressions
> 
> Signed-off-by: Eric Whitney <enwlinux@gmail.com>

Reviewed-by: Eric Sandeen <sandeen@redhat.com>

> ---
>  common.filter |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/common.filter b/common.filter
> index 9e4c90c..c854a98 100644
> --- a/common.filter
> +++ b/common.filter
> @@ -106,8 +106,10 @@ EOF
>  
>    # fix up min, max precision for output
>    # can vary for 5.3, 6.2
> -  _min=`echo $_min | sed -e 's/0*$//'` # get rid of trailling zeroes
> -  _max=`echo $_max | sed -e 's/0*$//'` # get rid of trailling zeroes
> +
> +  # remove any trailing zeroes from min, max if they have fractional parts
> +  _min=`echo $_min | sed -e '/\./s/0*$//' -e 's/\.$//'`
> +  _max=`echo $_max | sed -e '/\./s/0*$//' -e 's/\.$//'`
>  
>    if [ $_in_range -eq 1 ] 
>    then
> 

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

Re: [PATCH V3] xfstests: don't remove trailing zeros from integers

[Rich Johnston]

This patch has been committed.

Thanks
--Rich


commit edce9e677fda49ca20d6059248937ab4af65d053
Author: Eric Whitney <enwlinux@gmail.com>
Date:   Tue Mar 5 19:17:48 2013 +0000

     xfstests: don't remove trailing zeros from integers

     _within_tolerance strips trailing zeros from the min and max range
     values it outputs.  This leads to damage if the min or max value is
     an integer containing trailing zeros rather than a real number with
     a fractional part containing trailing zeros. Xfstest 289 can exhibit
     this problem when its input is out of range.  Modify the code so it
     will only remove trailing zeros found after a decimal point.

     V1->V2: Remove decimal points not followed by digits
     V2->V3: Per Dave Chinner, simplify by using multiple sed expressions

     Signed-off-by: Eric Whitney <enwlinux@gmail.com>
     Reviewed-by: Eric Sandeen <sandeen@redhat.com>
     Signed-off-by: Rich Johnston <rjohnston@sgi.com>

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