[PATCH] generic/594: require setquota tool supports project quota

[Date Prev] [Date Next] [Thread Prev] [Thread Next] [Date Index] [Thread Index]



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@xxxxxxxxxx>
---
 common/quota      | 9 +++++++++
 tests/generic/594 | 1 +
 2 files changed, 10 insertions(+)

diff --git a/common/quota b/common/quota
index 4e07fef1..240e0bbc 100644
--- 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 e501d54c..2665e5b4 100755
--- 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
-- 
2.20.1




[Index of Archives]     [Linux Filesystems Development]     [Linux NFS]     [Linux NILFS]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux