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 <dchinner@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/tests/generic/383 b/tests/generic/383
index be5b19b75703eb767855fa84eb3eb3398a3d7268..93836eaa9bfcb19fe934a97be7754f5c06df12dd 100755 (executable)
--- 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 452d26e34e39d393bff8a805edbfe85390b79d37..4784e47fc11e477e0d457b6f3097550b8be5e0a3 100755 (executable)
--- 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 f07ae5d5b00f9a38c611946c23212e96e641ca82..b7c5bd39569c200bf86e2b48a6ada9dcecefce29 100755 (executable)
--- 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 3aede60b68a1e6035d708a296bfb13c947270d57..0ceb14de9239fb6f7a0cdfcc2c7f7e43b2aa8177 100755 (executable)
--- 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}"