From patchwork Thu Oct 9 22:54:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 5058681 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 E8D4F9F295 for ; Thu, 9 Oct 2014 14:55:43 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 291512012F for ; Thu, 9 Oct 2014 14:55:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F43920114 for ; Thu, 9 Oct 2014 14:55:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbaJIOzl (ORCPT ); Thu, 9 Oct 2014 10:55:41 -0400 Received: from mail-ig0-f174.google.com ([209.85.213.174]:60441 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751372AbaJIOzl (ORCPT ); Thu, 9 Oct 2014 10:55:41 -0400 Received: by mail-ig0-f174.google.com with SMTP id a13so7544607igq.1 for ; Thu, 09 Oct 2014 07:55:40 -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=oS53Nx5Qu6Wth76dI+HieqBXQaYm8/LTXAXOczzgAEE=; b=Qq4T2aHRpX81bI9V4+HLPo0gKysbsROCHupUNVA/K0Sdt3i5ehHT6oQOXU7GJPAgV6 gGoqeSyVjoR45JWWOt4/mNvC6ECZm4jGC3y0b7/YoDCmYXuq//2ur6I5mxsgch6LN6Ta j5elNwQGnVgDpP0bC1pbWf3dLr44hKgaGZXuhSjjX0jF0B7FcXY0I0D452Na3wW8grHl r1Dmd36W2VaLe3MWmy68hGGWtLQ0noeDLb3jJcldjo+7sLvGtHda61m/64TAEoPCts6t hmuHEAJfxhfo2rDYto47hQBDy4c3ra6DIU3+0WgHzOGDG15fNhKBVYD2hzgblwcUk1ti z36A== X-Received: by 10.50.50.193 with SMTP id e1mr2567430igo.9.1412866540247; Thu, 09 Oct 2014 07:55:40 -0700 (PDT) Received: from vm01.localdomain ([221.181.146.136]) by mx.google.com with ESMTPSA id lp6sm15328333igb.16.2014.10.09.07.55.38 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Oct 2014 07:55:39 -0700 (PDT) From: Wang Shilong To: fstests@vger.kernel.org Subject: [PATCH] xfstests,shared/032: fix fsck failure Date: Thu, 9 Oct 2014 18:54:45 -0400 Message-Id: <1412895285-10544-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 --- tests/shared/032 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/shared/032 b/tests/shared/032 index 7835e30..7a1a242 100755 --- a/tests/shared/032 +++ b/tests/shared/032 @@ -91,6 +91,9 @@ do fi done +# make fsck happy later. +_scratch_mkfs > /dev/null 2>&1 + # success, all done status=0 exit