From patchwork Fri Oct 10 00:16:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Shilong X-Patchwork-Id: 5059091 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 78BDC9F349 for ; Thu, 9 Oct 2014 16:17:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B1EA8201EC for ; Thu, 9 Oct 2014 16:17:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6801201DD for ; Thu, 9 Oct 2014 16:17:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752628AbaJIQRu (ORCPT ); Thu, 9 Oct 2014 12:17:50 -0400 Received: from mail-pd0-f169.google.com ([209.85.192.169]:49449 "EHLO mail-pd0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751571AbaJIQRu (ORCPT ); Thu, 9 Oct 2014 12:17:50 -0400 Received: by mail-pd0-f169.google.com with SMTP id w10so44671pde.28 for ; Thu, 09 Oct 2014 09:17:49 -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=rwFODlVE7j/fKoIgTIHn5K8xhXLj+j0p0U2mbpY+jM4=; b=c4zduSrfYlxDOrwITZGbNFGCVaHO8H9V5TgiAjraYN8xjVm1jhBjb+E95NVAaYh78j CH3GVXQRwryD/kiLN8tR3PIaiD1Oi/qIO7puD9wdMudA4v4OIGdmOgFN8uJnDIvFN5Nl AobAcBL3E4oeA+NM0l4W5oLB3f9GzH/nZ/j77ibjKnW39+zq9ObCWhr2VOd7tTyw2ABi VBonbCMfFmuhmTym938S50VadhLO6eatc2g9P8Quvwq46kwXpKyj0FfYmZt9sN1p4bnB Fxksmttli9Pruz5dPTqZF7xrsk49SeGD6IlsdnpUuy6tM9d3hYpsfH/lWKZkFQSU3VC6 Pa6A== X-Received: by 10.66.235.8 with SMTP id ui8mr677951pac.63.1412871469603; Thu, 09 Oct 2014 09:17:49 -0700 (PDT) Received: from vm01.localdomain ([221.181.146.136]) by mx.google.com with ESMTPSA id gw1sm957956pbd.49.2014.10.09.09.17.48 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Oct 2014 09:17:49 -0700 (PDT) From: Wang Shilong To: fstests@vger.kernel.org Subject: [PATCH v3] xfstests,shared/032: fix fsck failure Date: Thu, 9 Oct 2014 20:16:57 -0400 Message-Id: <1412900217-58174-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, fix this problem by skipping fsck here. Signed-off-by: Wang Shilong Reviewed-by: Eryu Guan --- v2->v3: fix commit message.... 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