From patchwork Sat Nov 12 18:41:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eryu Guan X-Patchwork-Id: 9424417 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 397AF6047D for ; Sat, 12 Nov 2016 18:41:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 35FCE2935D for ; Sat, 12 Nov 2016 18:41:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2981629377; Sat, 12 Nov 2016 18:41:17 +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 CC96C2935D for ; Sat, 12 Nov 2016 18:41:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966790AbcKLSlQ (ORCPT ); Sat, 12 Nov 2016 13:41:16 -0500 Received: from mx1.redhat.com ([209.132.183.28]:56038 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966447AbcKLSlP (ORCPT ); Sat, 12 Nov 2016 13:41:15 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26D1F8553D for ; Sat, 12 Nov 2016 18:41:15 +0000 (UTC) Received: from localhost (vpn1-5-49.pek2.redhat.com [10.72.5.49]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uACIfDtW017552; Sat, 12 Nov 2016 13:41:14 -0500 From: Eryu Guan To: fstests@vger.kernel.org Cc: Eryu Guan Subject: [PATCH] generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV Date: Sun, 13 Nov 2016 02:41:05 +0800 Message-Id: <1478976065-2060-1-git-send-email-eguan@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Sat, 12 Nov 2016 18:41:15 +0000 (UTC) Sender: fstests-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: fstests@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP generic/38[3-6] are made generic from xfs tests to test project quota on other filesystems, e.g. ext4. But we should make sure project quota is enabled in between of _scratch_enable_pquota and _qmount. Otherwise mount will fail if there's no project quota support on SCRATCH_DEV, e.g. ext2 and ext3. Signed-off-by: Eryu Guan Reviewed-by: Dave Chinner --- tests/generic/383 | 1 + tests/generic/384 | 2 +- tests/generic/385 | 2 +- tests/generic/386 | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/generic/383 b/tests/generic/383 index be5b19b..93836ea 100755 --- a/tests/generic/383 +++ b/tests/generic/383 @@ -54,6 +54,7 @@ _require_xfs_quota_foreign _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota +_require_prjquota $SCRATCH_DEV do_project_test() { diff --git a/tests/generic/384 b/tests/generic/384 index 452d26e..4784e47 100755 --- a/tests/generic/384 +++ b/tests/generic/384 @@ -73,10 +73,10 @@ chmod a+rwx $seqres.full # arbitrary users will write here _require_scratch _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota +_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount -_require_prjquota $SCRATCH_DEV report_quota() { diff --git a/tests/generic/385 b/tests/generic/385 index f07ae5d..b7c5bd3 100755 --- a/tests/generic/385 +++ b/tests/generic/385 @@ -71,9 +71,9 @@ quota_cmd="$XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid" _scratch_mkfs >/dev/null 2>&1 _scratch_enable_pquota +_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount -_require_prjquota $SCRATCH_DEV # # Create the project root diff --git a/tests/generic/386 b/tests/generic/386 index 3aede60..0ceb14d 100755 --- a/tests/generic/386 +++ b/tests/generic/386 @@ -127,10 +127,10 @@ echo $proj_num:$proj_dir > "$my_projects" _scratch_mkfs >> "$seqres.full" 2>&1 _scratch_enable_pquota +_require_prjquota $SCRATCH_DEV _qmount_option "prjquota" _qmount -_require_prjquota $SCRATCH_DEV mkdir -p "${proj_dir}"