From patchwork Sat Jan 28 17:38:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Darrick J. Wong" X-Patchwork-Id: 9543409 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 34BDF604A0 for ; Sat, 28 Jan 2017 17:38:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 15B052808F for ; Sat, 28 Jan 2017 17:38:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08C5328358; Sat, 28 Jan 2017 17:38:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4C1EC2808F for ; Sat, 28 Jan 2017 17:38:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751197AbdA1RiU (ORCPT ); Sat, 28 Jan 2017 12:38:20 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:41310 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751171AbdA1RiT (ORCPT ); Sat, 28 Jan 2017 12:38:19 -0500 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v0SHcFR3029049 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2017 17:38:15 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id v0SHcENR026754 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Sat, 28 Jan 2017 17:38:15 GMT Received: from abhmp0001.oracle.com (abhmp0001.oracle.com [141.146.116.7]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v0SHcEid032761; Sat, 28 Jan 2017 17:38:14 GMT Received: from localhost (/24.21.211.40) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Sat, 28 Jan 2017 09:38:13 -0800 Subject: [PATCH 1/3] xfs/263: don't hardcode inode numbers in output From: "Darrick J. Wong" To: eguan@redhat.com, darrick.wong@oracle.com Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org Date: Sat, 28 Jan 2017 09:38:12 -0800 Message-ID: <148562509264.30594.7506967863745489318.stgit@birch.djwong.org> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Darrick J. Wong Since we can't control the inode number assignments when creating files, don't hardcode them in the golden output. Signed-off-by: Darrick J. Wong --- tests/xfs/263 | 6 +++++- tests/xfs/263.out | 52 ++++++++++++++++++++++++++-------------------------- 2 files changed, 31 insertions(+), 27 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/tests/xfs/263 b/tests/xfs/263 index 1dc47ae..7aebf90 100755 --- a/tests/xfs/263 +++ b/tests/xfs/263 @@ -71,6 +71,10 @@ function option_string() echo $OPT } +filter_quota_state() { + sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch +} + function test_all_state() { for I in `seq 0 7`; do @@ -79,7 +83,7 @@ function test_all_state() # Some combinations won't mount on V4 supers (grp + prj) _qmount_option "$OPTIONS" _scratch_mount &>> $seqres.full || continue - $XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | _filter_scratch + $XFS_QUOTA_PROG -x -c "state" $SCRATCH_MNT | filter_quota_state _scratch_unmount done } diff --git a/tests/xfs/263.out b/tests/xfs/263.out index 70454dd..531d45d 100644 --- a/tests/xfs/263.out +++ b/tests/xfs/263.out @@ -5,7 +5,7 @@ QA output created by 263 User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #131 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -21,11 +21,11 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #131 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #132 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -37,11 +37,11 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #131 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #132 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -53,7 +53,7 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #131 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -61,7 +61,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #132 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days] @@ -69,7 +69,7 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #131 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -77,7 +77,7 @@ Group quota state on SCRATCH_MNT (SCRATCH_DEV) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #132 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days] @@ -89,7 +89,7 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -105,11 +105,11 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -121,11 +121,11 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF @@ -137,15 +137,15 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #101 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days] @@ -153,15 +153,15 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #101 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days] @@ -169,15 +169,15 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: OFF Enforcement: OFF - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #101 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days] @@ -185,15 +185,15 @@ Realtime Blocks grace time: [7 days] User quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #99 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Group quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #100 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Project quota state on SCRATCH_MNT (SCRATCH_DEV) Accounting: ON Enforcement: ON - Inode: #101 (1 blocks, 1 extents) + Inode #XXX (1 blocks, 1 extents) Blocks grace time: [7 days] Inodes grace time: [7 days] Realtime Blocks grace time: [7 days]