From patchwork Wed Jul 26 18:43:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeff Layton X-Patchwork-Id: 9865693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 695AE602B1 for ; Wed, 26 Jul 2017 18:43:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E87E287AD for ; Wed, 26 Jul 2017 18:43:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 53575287C5; Wed, 26 Jul 2017 18:43:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EC4D2287AD for ; Wed, 26 Jul 2017 18:43:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750955AbdGZSne (ORCPT ); Wed, 26 Jul 2017 14:43:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:35514 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbdGZSne (ORCPT ); Wed, 26 Jul 2017 14:43:34 -0400 Received: from tleilax.poochiereds.net (cpe-45-37-196-243.nc.res.rr.com [45.37.196.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6512A22C93; Wed, 26 Jul 2017 18:43:33 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6512A22C93 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=jlayton@kernel.org From: Jeff Layton To: Eryu Guan Cc: fstests@vger.kernel.org, cluster-devel@redhat.com Subject: [xfstests PATCH] gfs2: allow testing with gfs2 Date: Wed, 26 Jul 2017 14:43:31 -0400 Message-Id: <20170726184331.27953-1-jlayton@kernel.org> X-Mailer: git-send-email 2.13.3 Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Jeff Layton For now, just have it avoid locking. With a fixed kernel, generic/441 now passes. Signed-off-by: Jeff Layton --- common/config | 1 + common/rc | 7 +++++++ tests/generic/441 | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/common/config b/common/config index 5091db9d5099..eb32efc105db 100644 --- a/common/config +++ b/common/config @@ -244,6 +244,7 @@ case "$HOSTOS" in export MKFS_REISER4_PROG="`set_prog_path mkfs.reiser4`" export E2FSCK_PROG="`set_prog_path e2fsck`" export TUNE2FS_PROG="`set_prog_path tune2fs`" + export MKFS_GFS2_PROG="`set_prog_path mkfs.gfs2`" ;; esac diff --git a/common/rc b/common/rc index bd989bb5f4dd..70bb39225368 100644 --- a/common/rc +++ b/common/rc @@ -158,6 +158,9 @@ case "$FSTYP" in ext4) [ "$MKFS_EXT4_PROG" = "" ] && _fatal "mkfs.ext4 not found" ;; + gfs2) + [ "$MKFS_GFS2_PROG" = "" ] && _fatal "mkfs.gfs2 not found" + ;; f2fs) [ "$MKFS_F2FS_PROG" = "" ] && _fatal "mkfs.f2fs not found" ;; @@ -861,6 +864,10 @@ _scratch_mkfs() mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --" mkfs_filter="grep -v -e ^mkfs\.ocfs2" ;; + gfs2) + mkfs_cmd="$MKFS_GFS2_PROG -p lock_nolock -O" + mkfs_filter="cat" + ;; *) mkfs_cmd="yes | $MKFS_PROG -t $FSTYP --" mkfs_filter="cat" diff --git a/tests/generic/441 b/tests/generic/441 index 075d87723ca1..b98f709cb6eb 100755 --- a/tests/generic/441 +++ b/tests/generic/441 @@ -55,7 +55,7 @@ case $FSTYP in btrfs) _notrun "btrfs has a specialized test for this" ;; - ext3|ext4|xfs) + ext3|ext4|gfs2|xfs) # Do the more thorough test if we have a logdev _has_logdev && sflag='' ;;