From: Eric Sandeen <sandeen@sandeen.net>
Date: Mon, 10 Aug 2009 18:18:50 +0000 (-0500)
Subject: Split out xfs & generic quota existence tests
X-Git-Tag: v1.1.0~247
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f07531f8761bdd231bc85972af58f3edbbab5172;p=xfstests-dev.git

Split out xfs & generic quota existence tests

Make a new test to test for generic quota tools, for
generic filesystem testing.  Move the existing quota test
to a new "xfs" name.

Signed-off-by: Eric Sandeen <sandeen@sandeen.net>
Reviewed-by: Lachlan McIlroy <lmcilroy@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/050 b/050
index abb806a7..306a7b53 100755
--- a/050
+++ b/050
@@ -55,7 +55,7 @@ cp /dev/null $seq.full
 chmod a+rwx $seq.full	# arbitrary users will write here
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 
 bsoft=100
 bhard=500
diff --git a/052 b/052
index 16c78de6..3d8bb9e1 100755
--- a/052
+++ b/052
@@ -54,7 +54,7 @@ _supported_os IRIX Linux
 rm -f $seq.full
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 _require_nobody
 
 # setup a default run
diff --git a/054 b/054
index b495e51f..b38efab1 100755
--- a/054
+++ b/054
@@ -52,7 +52,7 @@ cp /dev/null $seq.full
 chmod ugo+rwx $seq.full
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 
 _filter_stat()
 {
diff --git a/081 b/081
index 30364845..c8eba80b 100755
--- a/081
+++ b/081
@@ -54,7 +54,7 @@ trap "_cleanup; exit \$status" 0 1 2 3 15
 # prelim
 rm -f $seq.full $tmp.*
 _require_scratch
-_require_quota
+_require_xfs_quota
 _require_v2log
  
 echo "*** init FS"
diff --git a/106 b/106
index 71549795..30f740bf 100755
--- a/106
+++ b/106
@@ -42,7 +42,7 @@ trap "rm -f $tmp.*; exit \$status" 0 1 2 3 15
 _supported_fs xfs
 _supported_os Linux #IRIX
 _require_scratch
-_require_quota
+_require_xfs_quota
 _require_prjquota
 
 # real QA test starts here
diff --git a/107 b/107
index cfa82136..f36dc214 100755
--- a/107
+++ b/107
@@ -54,7 +54,7 @@ s/Inode: \#\d+ \(\d+ blocks, \d+ extents\)/Inode: #[INO] (X blocks, Y extents)/;
 _supported_fs xfs
 _supported_os Linux #IRIX
 _require_scratch
-_require_quota
+_require_xfs_quota
 _require_prjquota
 
 # real QA test starts here
diff --git a/108 b/108
index 3f3e1fb6..3a1fee94 100755
--- a/108
+++ b/108
@@ -49,7 +49,7 @@ s,$SCRATCH_DEV,[SCR_DEV],;
 _supported_fs xfs
 _supported_os Linux #IRIX
 _require_scratch
-_require_quota
+_require_xfs_quota
 _require_prjquota
 
 test_files()
diff --git a/116 b/116
index 8394054a..e902ce90 100755
--- a/116
+++ b/116
@@ -51,7 +51,7 @@ _supported_fs xfs
 _supported_os IRIX Linux
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 
 mkfs.xfs -f $SCRATCH_DEV >/dev/null 2>&1
 mount -o uquota $SCRATCH_DEV $SCRATCH_MNT
diff --git a/118 b/118
index 6b28055f..cb0e5ee6 100755
--- a/118
+++ b/118
@@ -52,7 +52,7 @@ _supported_fs xfs
 _supported_os IRIX Linux
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 
 _chowning_file()
 {
diff --git a/134 b/134
index fc2ab74a..f00e1f0a 100755
--- a/134
+++ b/134
@@ -50,7 +50,7 @@ _cleanup()
 _supported_fs xfs
 _supported_os Linux IRIX
 
-_require_quota
+_require_xfs_quota
 
 dir=$SCRATCH_MNT/project
 
diff --git a/196 b/196
index 7768618a..5da36596 100755
--- a/196
+++ b/196
@@ -51,7 +51,7 @@ _supported_fs xfs
 _supported_os Linux
 
 _require_scratch
-_require_quota
+_require_xfs_quota
 
 #
 # Setup temporary replacements for /etc/projects and /etc/projid
diff --git a/common.quota b/common.quota
index a9dfb422..e2a78724 100644
--- a/common.quota
+++ b/common.quota
@@ -21,14 +21,27 @@
 #
 
 #
-# checks that the XFS quota support in the kernel is enabled
+# checks that the generic quota support in the kernel is enabled
 # and that we have valid quota user tools installed.
 #
 _require_quota()
+{
+    [ -x /usr/bin/quota ] || _notrun "Quota user tools not installed"
+    _scratch_mount "-o usrquota,grpquota"
+    ret=$?
+    umount $SCRATCH_MNT
+    [ $ret -ne 0 ] && _notrun "Installed kernel does not support quota"
+}
+
+#
+# checks that the XFS quota support in the kernel is enabled
+# and that we have valid quota user tools installed.
+#
+_require_xfs_quota()
 {
     src/feature -q $TEST_DEV
     [ $? -ne 0 ] && _notrun "Installed kernel does not support XFS quota"
-    [ -x /usr/sbin/xfs_quota ] || _notrun "Quota user tools not installed"
+    [ -x /usr/sbin/xfs_quota ] || _notrun "XFS quota user tools not installed"
 }
 
 #