From patchwork Fri Nov 4 16:16:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9486081 X-Mozilla-Keys: nonjunk Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on sandeen.net X-Spam-Level: X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD autolearn=ham autolearn_force=no version=3.4.0 X-Spam-HP: BAYES_00=-1.9,HEADER_FROM_DIFFERENT_DOMAINS=0.001, RCVD_IN_DNSWL_HI=-5,RP_MATCHES_RCVD=-0.1 X-Original-To: sandeen@sandeen.net Delivered-To: sandeen@sandeen.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by sandeen.net (Postfix) with ESMTP id D667111658 for ; Fri, 4 Nov 2016 11:16:11 -0500 (CDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934989AbcKDQQ0 (ORCPT ); Fri, 4 Nov 2016 12:16:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45646 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934706AbcKDQQZ (ORCPT ); Fri, 4 Nov 2016 12:16:25 -0400 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1AD2C4E33B; Fri, 4 Nov 2016 16:16:25 +0000 (UTC) Received: from localhost (dhcp-12-157.nay.redhat.com [10.66.12.157]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uA4GGNvE025990; Fri, 4 Nov 2016 12:16:24 -0400 From: Eryu Guan To: fstests@vger.kernel.org Cc: linux-xfs@vger.kernel.org, Eryu Guan Subject: [PATCH] xfs/021: filter out detailed array element info from xfs_db Date: Sat, 5 Nov 2016 00:16:10 +0800 Message-Id: <1478276170-6618-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 04 Nov 2016 16:16:25 +0000 (UTC) Sender: linux-xfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-xfs@vger.kernel.org Starting from xfsprogs commit 384283555871 ("xfs_db: print one array element per line"), xfs_db prints one array element per line. This breaks the filter in xfs/021, which now fails as: hdr.freemap[0-2] = [base,size] [FREEMAP..] +0:[104,1892] +1:[0,0] +2:[0,0] entries[0-2] = [hashval,nameidx,incomplete,root,local] [ENTRIES..] So we have extra lines that need to be filtered out, Signed-off-by: Eryu Guan --- tests/xfs/021 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/xfs/021 b/tests/xfs/021 index 67a4346..b99eff7 100755 --- a/tests/xfs/021 +++ b/tests/xfs/021 @@ -151,7 +151,7 @@ s/^(hdr.info.magic =) 0x3bee/\1 0xfbee/; s/^(hdr.firstused =) (\d+)/\1 FIRSTUSED/; s/^(hdr.freemap\[0-2] = \[base,size]).*/\1 [FREEMAP..]/; s/^(entries\[0-2] = \[hashval,nameidx,incomplete,root,local]).*/\1 [ENTRIES..]/; - print;' + print unless /^[0-9]/;' echo "*** done" exit