From patchwork Tue Jan 14 03:23:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anand Jain X-Patchwork-Id: 3483741 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E6CBFC02DC for ; Tue, 14 Jan 2014 03:14:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1CAFB20166 for ; Tue, 14 Jan 2014 03:14:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17D4820161 for ; Tue, 14 Jan 2014 03:14:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752724AbaANDOi (ORCPT ); Mon, 13 Jan 2014 22:14:38 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:21783 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322AbaANDOg (ORCPT ); Mon, 13 Jan 2014 22:14:36 -0500 Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s0E3EYTM012631 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 14 Jan 2014 03:14:35 GMT Received: from aserz7022.oracle.com (aserz7022.oracle.com [141.146.126.231]) by ucsinet22.oracle.com (8.14.5+Sun/8.14.5) with ESMTP id s0E3EXFa021645 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 14 Jan 2014 03:14:34 GMT Received: from abhmp0012.oracle.com (abhmp0012.oracle.com [141.146.116.18]) by aserz7022.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s0E3EXUg003106; Tue, 14 Jan 2014 03:14:33 GMT Received: from wish.sg.oracle.com (/10.186.101.18) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 13 Jan 2014 19:14:33 -0800 From: Anand Jain To: linux-btrfs@vger.kernel.org Cc: wangshilong1991@gmail.com Subject: [PATCH 1/2 v2] xfstests: make btrfs/001.out in line with subvol delete output Date: Tue, 14 Jan 2014 11:23:48 +0800 Message-Id: <1389669828-2222-1-git-send-email-anand.jain@oracle.com> X-Mailer: git-send-email 1.8.1.164.g2d0029e In-Reply-To: <1389618990-24544-1-git-send-email-anand.jain@oracle.com> References: <1389618990-24544-1-git-send-email-anand.jain@oracle.com> X-Source-IP: ucsinet22.oracle.com [156.151.31.94] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-7.0 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Anand Jain btrfs/001 is failing as the below btrfs-progs patch changed the output during subvol delete. Patch : btrfs-progs: add options to set commit mode after subvol delete adding it to the filter Signed-off-by: Anand Jain --- v2: accepts Wang suggested common/filter | 4 ++++ common/filter.btrfs | 6 ++++++ tests/btrfs/001 | 3 ++- 3 files changed, 12 insertions(+), 1 deletions(-) diff --git a/common/filter b/common/filter index c872a27..3842c1b 100644 --- a/common/filter +++ b/common/filter @@ -313,5 +313,9 @@ _filter_ro_mount() { -e "s/mount: cannot mount block device/mount: cannot mount/g" } +_filter_transcation_commit_default() { + sed -e "/Transaction commit: none (default)/d" +} + # make sure this script returns success /bin/true diff --git a/common/filter.btrfs b/common/filter.btrfs index 29512cd..563dff4 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -56,5 +56,11 @@ _filter_btrfs_device_stats() sed -e "s/ *$NUMDEVS / /g" } +_filter_btrfs_subvol_delete() +{ + _filter_scratch | _filter_transcation_commit_default + +} + # make sure this script returns success /bin/true diff --git a/tests/btrfs/001 b/tests/btrfs/001 index c05d772..8258d06 100755 --- a/tests/btrfs/001 +++ b/tests/btrfs/001 @@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common/rc . ./common/filter +. ./common/filter.btrfs # real QA test starts here _supported_fs btrfs @@ -98,7 +99,7 @@ echo "Listing subvolumes" $BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }' # Delete the snapshot -$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch +$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete echo "List root dir" ls $SCRATCH_MNT _scratch_remount