From patchwork Wed Sep 3 03:25:59 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Bo X-Patchwork-Id: 4830271 Return-Path: X-Original-To: patchwork-linux-btrfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id C18BF9F2ED for ; Wed, 3 Sep 2014 03:26:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 041F5201D3 for ; Wed, 3 Sep 2014 03:26:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1516E20176 for ; Wed, 3 Sep 2014 03:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753308AbaICD0c (ORCPT ); Tue, 2 Sep 2014 23:26:32 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:31310 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062AbaICD0c (ORCPT ); Tue, 2 Sep 2014 23:26:32 -0400 Received: from acsinet22.oracle.com (acsinet22.oracle.com [141.146.126.238]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id s833QQIj009281 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 3 Sep 2014 03:26:27 GMT Received: from userz7022.oracle.com (userz7022.oracle.com [156.151.31.86]) by acsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id s833QPUN026906 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 3 Sep 2014 03:26:26 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by userz7022.oracle.com (8.14.5+Sun/8.14.4) with ESMTP id s833QOg4014937; Wed, 3 Sep 2014 03:26:25 GMT Received: from localhost.jp.oracle.com (/10.191.5.50) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Tue, 02 Sep 2014 20:26:24 -0700 From: Liu Bo To: xfs@oss.sgi.com Cc: linux-btrfs Subject: [PATCH] xfstests: remove check_scratch_fs in btrfs/012 Date: Wed, 3 Sep 2014 11:25:59 +0800 Message-Id: <1409714759-9805-1-git-send-email-bo.li.liu@oracle.com> X-Mailer: git-send-email 1.8.1.4 X-Source-IP: acsinet22.oracle.com [141.146.126.238] Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Spam-Status: No, score=-8.6 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: Liu Bo btrfs/012 is a case to verify btrfs-convert feature, it converts an ext4 to btrfs firstly and do something, then rolls back to ext4. So at last we have a ext4 on the scratch device, but setting _require_scratch will force a btrfsck on a ext4 fs because $FSTYP here is btrfs, and it ends up with a failure report of _check_btrfs_filesystem. Now that we have deliberately check the final ext4 fs in btrfs/012, just do not set _require_scratch in this case. Signed-off-by: Liu Bo --- tests/btrfs/012 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/btrfs/012 b/tests/btrfs/012 index f7e5da5..12f6462 100755 --- a/tests/btrfs/012 +++ b/tests/btrfs/012 @@ -52,7 +52,6 @@ _cleanup() # Modify as appropriate. _supported_fs btrfs _supported_os Linux -_require_scratch BTRFS_CONVERT_PROG="`set_prog_path btrfs-convert`" MKFS_EXT4_PROG="`set_prog_path mkfs.ext4`"