From patchwork Fri Oct 10 00:13:30 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 5059081 Return-Path: X-Original-To: patchwork-fstests@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 C8B429F349 for ; Thu, 9 Oct 2014 16:14:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C85F9201EC for ; Thu, 9 Oct 2014 16:14:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0C703201DD for ; Thu, 9 Oct 2014 16:14:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752456AbaJIQOY (ORCPT ); Thu, 9 Oct 2014 12:14:24 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:53558 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751197AbaJIQOX (ORCPT ); Thu, 9 Oct 2014 12:14:23 -0400 Received: by mail-pa0-f43.google.com with SMTP id lf10so50683pab.2 for ; Thu, 09 Oct 2014 09:14:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=QERjSLC24nwAge+X5MO9Kl05fnLtr9dzbrHSVBPG77A=; b=dSC1drtza35+R56Ts+UB1KxxWMSq06hhUJoOAymPOMNOz8DRBpF0JqELXt0pN8eNpX n0eOimQUvNtKDtENs9fCumhaQcu4dL1eeKe6pvW73PuLkBzqL/w2OrTb0Vyngu4bFtv/ SAM9sBhOwRLjwdvg+IEqzCE53+Wlj+fdjKBmrpJO1ckp7jsXqKWw8KbJY4YGcZZT2lRg ixG6VmfiTll64pWFIXi7A/9kBC/FyRyFP1fKfoqeF5w6noFNeZTWLpvGCvqE7WJOPT6U Trw5SjP/pNRIPeodsypqq+NZQ49cCuAdLEGr7+idyfKTutik8FcBsO8p2+us0Y69HPEG rYtw== X-Received: by 10.70.100.34 with SMTP id ev2mr662877pdb.53.1412871263463; Thu, 09 Oct 2014 09:14:23 -0700 (PDT) Received: from vm01.localdomain ([221.181.146.136]) by mx.google.com with ESMTPSA id q1sm925804pdq.67.2014.10.09.09.14.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Oct 2014 09:14:22 -0700 (PDT) From: Wang Shilong To: fstests@vger.kernel.org Subject: [PATCH v2] xfstests,shared/032: fix fsck failure Date: Thu, 9 Oct 2014 20:13:30 -0400 Message-Id: <1412900010-58131-1-git-send-email-wangshilong1991@gmail.com> X-Mailer: git-send-email 1.8.3.1 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DATE_IN_FUTURE_06_12, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 while running ./check tests/shared/032, it outputs something like: FSTYP -- btrfs PLATFORM -- Linux/x86_64 vm01 3.17.0-rc5+ MKFS_OPTIONS -- /dev/sdc MOUNT_OPTIONS -- /dev/sdc /mnt/scratch shared/032 2s ... 2s _check_btrfs_filesystem: filesystem on /dev/sdc is inconsistent (see /root/xfstests-dev/results//shared/032.full) Ran: shared/032 Passed all 1 tests This is because xfstests will run fsck after each unit test, for tests/shared/032, we have reformated SCRATCH_DEV to other fs, so to make fsck happy later, let's fomrat fs here. Signed-off-by: Wang Shilong --- v1->v2: use _require_scratch_nocheck helper to skip fsck.(pointed by Eryu Guan) --- tests/shared/032 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shared/032 b/tests/shared/032 index 7835e30..a410003 100755 --- a/tests/shared/032 +++ b/tests/shared/032 @@ -40,7 +40,7 @@ rm -f $seqres.full _supported_fs xfs btrfs _supported_os Linux -_require_scratch +_require_scratch_nocheck _require_no_large_scratch_dev # mkfs.btrfs did not have overwrite detection at first