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 4D6E37CA3 for ; Thu, 31 Mar 2016 01:12:03 -0500 (CDT) Received: from cuda.sgi.com (cuda1.sgi.com [192.48.157.11]) by relay2.corp.sgi.com (Postfix) with ESMTP id 014FF30404E for ; Wed, 30 Mar 2016 23:11:56 -0700 (PDT) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by cuda.sgi.com with ESMTP id olNBUVarfYLq15sW (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Wed, 30 Mar 2016 23:11:55 -0700 (PDT) From: Eryu Guan Subject: [PATCH v2] xfs/030: filter out repeated lines from .out files Date: Thu, 31 Mar 2016 14:11:22 +0800 Message-Id: <1459404682-12282-1-git-send-email-eguan@redhat.com> In-Reply-To: <1459331861-15025-1-git-send-email-eguan@redhat.com> References: <1459331861-15025-1-git-send-email-eguan@redhat.com> List-Id: XFS Filesystem from SGI List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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: fstests@vger.kernel.org Cc: darrick.wong@oracle.com, Eryu Guan , xfs@oss.sgi.com Commit 31f48569c353 ("xfs/030: fix output on newer filesystems") added more lines to .out file to match the output from XFS with reflink support, but it broke test on older XFS. Dave explained the reason and pointed out the correct way to fix it, so I just quote Dave's mail here: "The problem here is that reflink triggers a change in the initial population of the AGFL - from 4 blocks to 6 blocks, and so repair warns 6 times instead of 4. After filtering, that gives 6 indentical output lines instead of 4. Doing something as simple as collapsing repeated identical lines (e.g filtering through uniq) will work for all filesystem formats and any future changes that modify the initial AGFL population." Suggested-by: Dave Chinner Signed-off-by: Eryu Guan --- tests/xfs/030 | 2 +- tests/xfs/030.out.irix | 3 --- tests/xfs/030.out.linux | 5 ----- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/tests/xfs/030 b/tests/xfs/030 index 33c906c..5c99d9e 100755 --- a/tests/xfs/030 +++ b/tests/xfs/030 @@ -55,7 +55,7 @@ _check_ag() for structure in 'sb 0' 'agf 0' 'agi 0' 'agfl 0' do echo "Corrupting $structure - setting bits to $1" - _check_repair $1 "$structure" | + _check_repair $1 "$structure" | uniq | sed -e '/^error following ag 0 unlinked list$/d' \ -e '/^bad agbno AGBNO for finobt/d' \ -e '/^bad agbno AGBNO for rmapbt/d' \ diff --git a/tests/xfs/030.out.irix b/tests/xfs/030.out.irix index 6378c73..56adfd0 100644 --- a/tests/xfs/030.out.irix +++ b/tests/xfs/030.out.irix @@ -263,9 +263,6 @@ Phase 1 - find and verify superblock... Phase 2 - zero log... - scan filesystem freespace and inode maps... bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 - found root inode chunk Phase 3 - for each AG... - scan and clear agi unlinked lists... diff --git a/tests/xfs/030.out.linux b/tests/xfs/030.out.linux index 14b9b35..722cabf 100644 --- a/tests/xfs/030.out.linux +++ b/tests/xfs/030.out.linux @@ -228,11 +228,6 @@ Phase 2 - using log - zero log... - scan filesystem freespace and inode maps... bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 -bad agbno AGBNO in agfl, agno 0 - found root inode chunk Phase 3 - for each AG... - scan and clear agi unlinked lists... -- 2.5.5 _______________________________________________ xfs mailing list xfs@oss.sgi.com http://oss.sgi.com/mailman/listinfo/xfs