xfs: modify quota tests to work on generic filesystems

Fix several xfs quota tests to work on non-xfs filesystems.

New _require function to be sure that the xfs_quota tool can operate
on foreign filesystems; if it can, and if it needs to, it adds "-f"
to the XFS_QUOTA_PROG variable.

Modify _qmount to do quotacheck/quotaon to mount and /enable/
quota.  On xfs this isn't needed and/or fails; it's ignored.

All quota-related options used as arguments to _qmount are changed
from i.e. uquota to i.e. usrquota; the latter is standard across
almost all linux filesytems, including xfs.

xfs/260 filters out the root/default quota line, because ext4
consumes a different amount of space than xfs, and it's not what
we're testing for, so just ignore it.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Bill O'Donnell <billodo@redhat.com>
Signed-off-by: Eryu Guan <eguan@redhat.com>

diff --git a/common/quota b/common/quota
index d91062a7de80dec2cb753d7f79116defc22ebd93..ce6940071e3d678b936946c005cc4f950d1277ec 100644 (file)
--- a/common/quota
+++ b/common/quota
@@ -77,6 +77,20 @@ _require_xfs_quota()
     [ -n "$XFS_QUOTA_PROG" ] || _notrun "XFS quota user tools not installed"
 }
 
+#
+# checks that xfs_quota can operate on foreign (non-xfs) filesystems
+# Skips check on xfs filesystems, old xfs_quota is fine there.
+# Appends "-f" to enable foreign behavior on non-xfs filesystems if available.
+#
+_require_xfs_quota_foreign()
+{
+       if [ "$FSTYP" != "xfs" ]; then
+               $XFS_QUOTA_PROG -f -V &>/dev/null || \
+                _notrun "xfs_quota binary does not support foreign filesystems"
+               XFS_QUOTA_PROG="$XFS_QUOTA_PROG -f"
+       fi
+}
+
 #
 # checks that the XFS project quota support in the kernel is enabled.
 #
@@ -169,6 +183,12 @@ _qmount()
 {
     _scratch_unmount >/dev/null 2>&1
     _scratch_mount || _fail "qmount failed"
+    # xfs doesn't need these setups and quotacheck even fails on xfs
+    # redirect the output to $seqres.full for debug purpose and ignore results
+    if [ "$FSTYP" != "xfs" ]; then
+        quotacheck -ug $SCRATCH_MNT >>$seqres.full 2>&1
+        quotaon -ug $SCRATCH_MNT >>$seqres.full 2>&1
+    fi
     chmod ugo+rwx $SCRATCH_MNT
 }
 

diff --git a/tests/xfs/054 b/tests/xfs/054
index ea0f9f860f62194a32373307418732e80e7951eb..b4e5dd19e791163fb7078ba30414dba1e4cdbd85 100755 (executable)
--- a/tests/xfs/054
+++ b/tests/xfs/054
@@ -44,14 +44,15 @@ _cleanup()
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux IRIX
 
 cp /dev/null $seqres.full
 chmod ugo+rwx $seqres.full
 
 _require_scratch
-_require_xfs_quota
+_require_quota
+_require_xfs_quota_foreign
 
 _filter_stat()
 {
@@ -67,7 +68,7 @@ _filter_stat()
 
 _exercise()
 {
-       _scratch_mkfs_xfs >/dev/null 2>&1
+       _scratch_mkfs >/dev/null 2>&1
        _qmount
 
        umask 022
@@ -99,9 +100,9 @@ _exercise()
        _scratch_unmount 2>/dev/null
 }
 
-_scratch_mkfs_xfs >> $seqres.full 2>&1 || _fail "mkfs failed!"
+_scratch_mkfs >> $seqres.full 2>&1 || _fail "mkfs failed!"
 
-_qmount_option "uquota,gquota"
+_qmount_option "usrquota,grpquota"
 _qmount
 if src/feature -G $SCRATCH_DEV ; then
        :
@@ -114,16 +115,15 @@ _qmount_option "rw" # no quota options
 echo "*** Default mount options"
 _exercise
 
-_qmount_option "uquota"
+_qmount_option "usrquota"
 echo "*** User quota mount option"
 _exercise
 
-export MOUNT_OPTIONS="-o gquota"
-_qmount_option "gquota"
+_qmount_option "grpquota"
 echo "*** Group quota mount option"
 _exercise
 
-_qmount_option "uquota,gquota"
+_qmount_option "usrquota,grpquota"
 echo "*** User and Group quota mount options"
 _exercise
 

diff --git a/tests/xfs/118 b/tests/xfs/118
index 8414594e52bf21111233d0d91ec5b67cb1bc699c..8861108f7b3d6426fe7adbb2a778cb692c084239 100755 (executable)
--- a/tests/xfs/118
+++ b/tests/xfs/118
@@ -47,11 +47,12 @@ _cleanup()
 # real QA test starts here
 
 # Modify as appropriate.
-_supported_fs xfs
+_supported_fs generic
 _supported_os IRIX Linux
 
 _require_scratch
-_require_xfs_quota
+_require_quota
+_require_xfs_quota_foreign
 
 _chowning_file()
 {
@@ -72,10 +73,10 @@ _chowning_file()
 }
 
 echo "mkfs on scratch"
-_scratch_mkfs_xfs >$seqres.full
+_scratch_mkfs >$seqres.full 2>&1
 
 echo "mount with quotas"
-export MOUNT_OPTIONS="-o uquota"
+export MOUNT_OPTIONS="-o usrquota"
 _scratch_mount
 
 echo "creating quota file with holes"

diff --git a/tests/xfs/138 b/tests/xfs/138
index c6a6f50354c554c4af80a33518a271b5f85c6b8d..6b6a12f2732269a4822eab106f105d3bb8a8eb20 100755 (executable)
--- a/tests/xfs/138
+++ b/tests/xfs/138
@@ -47,17 +47,18 @@ _cleanup()
 rm -f $seqres.full
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_quota
+_require_xfs_quota_foreign
 
 # need user and group named 123456-fsgqa
 _require_user 123456-fsgqa
 _require_group 123456-fsgqa
 
-_scratch_mkfs_xfs >/dev/null 2>&1
-_qmount_option "uquota,gquota"
+_scratch_mkfs >/dev/null 2>&1
+_qmount_option "usrquota,grpquota"
 _qmount
 
 # user test

diff --git a/tests/xfs/260 b/tests/xfs/260
index 9c6162b41f551be7fdd36501ee1da466925f776c..a2bc3ce9805f872c2bd4214ce571066f5d40a978 100755 (executable)
--- a/tests/xfs/260
+++ b/tests/xfs/260
@@ -52,10 +52,11 @@ _cleanup()
 rm -f $seqres.full
 
 # real QA test starts here
-_supported_fs xfs
+_supported_fs generic
 _supported_os Linux
 _require_scratch
 _require_quota
+_require_xfs_quota_foreign
 _require_user
 _require_group
 
@@ -78,12 +79,12 @@ do_test()
        $XFS_QUOTA_PROG -x -c "limit bsoft=20M bhard=20M isoft=20 ihard=20 $type -d" $SCRATCH_MNT
        $XFS_QUOTA_PROG -x -c "limit bsoft=40M bhard=40M isoft=40 ihard=40 $type fsgqa" $SCRATCH_MNT
        echo "$qname blocks and inode limit"
-       $XFS_QUOTA_PROG -x -c "report $type -N -bi" $SCRATCH_MNT | _filter_spaces
+       $XFS_QUOTA_PROG -x -c "report $type -N -bi" $SCRATCH_MNT | grep -v ^root | _filter_spaces
 
        ## blocks default quota test ##
        _user_do "$XFS_IO_PROG -f -c \"pwrite 0 30M\" -c \"fsync\" $SCRATCH_MNT/data" | _filter_xfs_io
        echo "$qname blocks quota after write 30M data"
-       $XFS_QUOTA_PROG -x -c "report $type -N -b" $SCRATCH_MNT | _filter_spaces
+       $XFS_QUOTA_PROG -x -c "report $type -N -b" $SCRATCH_MNT | grep -v ^root | _filter_spaces
 
        rm -f ${SCRATCH_MNT}/* >/dev/null 2>&1
 
@@ -94,22 +95,22 @@ do_test()
        sync
 
        echo "$qname inode quota after creating 30 inodes"
-       $XFS_QUOTA_PROG -x -c "report $type -N -i" $SCRATCH_MNT | _filter_spaces
+       $XFS_QUOTA_PROG -x -c "report $type -N -i" $SCRATCH_MNT | grep -v ^root | _filter_spaces
 
        rm -f ${SCRATCH_MNT}/* >/dev/null 2>&1
 }
 
 ### user default quota test ###
-_scratch_mkfs_xfs >/dev/null 2>&1
-_qmount_option "uquota,gquota"
+_scratch_mkfs >/dev/null 2>&1
+_qmount_option "usrquota,grpquota"
 _qmount
 
 do_test user
 
 ### group default quota test ###
 _scratch_unmount
-_scratch_mkfs_xfs >/dev/null 2>&1
-_qmount_option "gquota,uquota"
+_scratch_mkfs >/dev/null 2>&1
+_qmount_option "grpquota,usrquota"
 _qmount
 
 do_test group

diff --git a/tests/xfs/260.out b/tests/xfs/260.out
index 0b198bfb2a28e4a8f90fdf876358335243d9927d..5eb1070a23ffeb3b6d7673eab5965ac11ee675f8 100644 (file)
--- a/tests/xfs/260.out
+++ b/tests/xfs/260.out
@@ -1,31 +1,25 @@
 QA output created by 260
 === user quota test ===
 user blocks and inode limit
-root 0 20480 20480 00 [--------] 3 20 20 00 [--------]
 fsgqa 0 40960 40960 00 [--------] 0 40 40 00 [--------]
 
 wrote 31457280/31457280 bytes at offset 0
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 user blocks quota after write 30M data
-root 0 20480 20480 00 [--------]
 fsgqa 30720 40960 40960 00 [--------]
 
 user inode quota after creating 30 inodes
-root 3 20 20 00 [--------]
 fsgqa 30 40 40 00 [--------]
 
 === group quota test ===
 group blocks and inode limit
-root 0 20480 20480 00 [--------] 3 20 20 00 [--------]
 fsgqa 0 40960 40960 00 [--------] 0 40 40 00 [--------]
 
 wrote 31457280/31457280 bytes at offset 0
 XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
 group blocks quota after write 30M data
-root 0 20480 20480 00 [--------]
 fsgqa 30720 40960 40960 00 [--------]
 
 group inode quota after creating 30 inodes
-root 3 20 20 00 [--------]
 fsgqa 30 40 40 00 [--------]