From 23f60ef304d6c7561a7baf32ca945ee46c8859bc Mon Sep 17 00:00:00 2001 From: Eryu Guan Date: Sun, 13 Nov 2016 01:22:26 +0800 Subject: [PATCH] generic/38[3-6]: require project quota to be enabled on SCRATCH_DEV 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. Reviewed-by: Dave Chinner Signed-off-by: Eryu Guan --- 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 be5b19b7..93836eaa 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 452d26e3..4784e47f 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 f07ae5d5..b7c5bd39 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 3aede60b..0ceb14de 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}" -- 2.39.5