generic/594: require setquota tool supports project quota

The old setquota tool doesn't support project quota, it doesn't has
"-P, --project" option. So _notrun the test to avoid a failure.

Signed-off-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/common/quota b/common/quota
index 4e07fef1569794ab29c301ed759ec8b41c3ef4d1..240e0bbc5dd41773e780521f0956f7aaa92a8079 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -124,6 +124,15 @@ _scratch_enable_pquota()
        esac
 }
 
+_require_setquota_project()
+{
+       setquota --help 2>&1 | \
+               grep -q "\-P, \-\-project[[:space:]]*set limits for project"
+       if [ "$?" -ne 0 ];then
+               _notrun "setquota doesn't support project quota (-P)"
+       fi
+}
+
 #
 # checks for user nobody in /etc/passwd and /etc/group.
 #

diff --git a/tests/generic/594 b/tests/generic/594
index e501d54c069e7310c54d342f72cfafba12287c37..2665e5b45bdaacd1c98f2fa3912ed3e0c43e7c66 100755 (executable)
--- a/tests/generic/594
+++ b/tests/generic/594
@@ -34,6 +34,7 @@ rm -f $seqres.full
 _supported_fs generic
 _supported_os Linux
 _require_scratch
+_require_setquota_project
 # V4 XFS doesn't support to mount project and group quota together
 if [ "$FSTYP" = "xfs" ];then
        _require_scratch_xfs_crc