From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from relay.sgi.com (relay2.corp.sgi.com [137.38.102.29]) by oss.sgi.com (Postfix) with ESMTP id 5ED4E802C for ; Tue, 5 Mar 2013 13:17:57 -0600 (CST) Received: from cuda.sgi.com (cuda3.sgi.com [192.48.176.15]) by relay2.corp.sgi.com (Postfix) with ESMTP id 4942330405F for ; Tue, 5 Mar 2013 11:17:57 -0800 (PST) Received: from mail-qe0-f44.google.com (mail-qe0-f44.google.com [209.85.128.44]) by cuda.sgi.com with ESMTP id HcZ0MeCZwIeVwvai (version=TLSv1 cipher=RC4-SHA bits=128 verify=NO) for ; Tue, 05 Mar 2013 11:17:53 -0800 (PST) Received: by mail-qe0-f44.google.com with SMTP id x7so4960831qeu.3 for ; Tue, 05 Mar 2013 11:17:53 -0800 (PST) Date: Tue, 5 Mar 2013 14:17:48 -0500 From: Eric Whitney Subject: [PATCH V3] xfstests: don't remove trailing zeros from integers Message-ID: <20130305191748.GB3930@wallace> MIME-Version: 1.0 Content-Disposition: inline List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: xfs-bounces@oss.sgi.com Sender: xfs-bounces@oss.sgi.com To: xfs@oss.sgi.com Cc: sandeen@redhat.com _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 --- 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