Project quota check in few tests should check SCRATCH_DEV and not
TEST_DEV. Fix that by making possible to pass device to be checked to
_require_prjquota().
Due to the problem tests didn't run with "Installed kernel does not
support project quotas" error.
Signed-off-by: Arkadiusz Miśkiewicz <arekm@xxxxxxxx>
---
106 | 5 +++--
107 | 3 +--
108 | 5 ++++-
common.quota | 3 ++-
4 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/106 b/106
index 5bff660..8278691 100755
--- a/106
+++ b/106
@@ -43,7 +43,6 @@ _supported_fs xfs
_supported_os Linux #IRIX
_require_scratch
_require_xfs_quota
-_require_prjquota
# real QA test starts here
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
@@ -57,8 +56,10 @@ else
export MOUNT_OPTIONS="$MOUNT_OPTIONS -o sync"
fi
-# initial populate
_qmount
+_require_prjquota $SCRATCH_DEV
+
+# initial populate
target=$SCRATCH_MNT/target
$FSSTRESS_PROG -s 0xdeed -m8 -w -p4 -n1000 $FSSTRESS_AVOID -d $target
$FSSTRESS_PROG -s 0xdeed -m8 -z -p4 -n1000 -fsetxattr=500 -fchown=500 -d $target
diff --git a/107 b/107
index c270f0e..74403e6 100755
--- a/107
+++ b/107
@@ -55,7 +55,6 @@ _supported_fs xfs
_supported_os Linux #IRIX
_require_scratch
_require_xfs_quota
-_require_prjquota
# real QA test starts here
_scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs
@@ -70,7 +69,7 @@ else
fi
_qmount
-src/feature -p $SCRATCH_MNT && _notrun "Cannot run without project quota"
+_require_prjquota $SCRATCH_DEV
echo "### create projects file"
rm -f $tmp.projects
diff --git a/108 b/108
index b429bc6..c1fb3d3 100755
--- a/108
+++ b/108
@@ -50,7 +50,6 @@ _supported_fs xfs
_supported_os Linux #IRIX
_require_scratch
_require_xfs_quota
-_require_prjquota
test_files()
{
@@ -86,6 +85,10 @@ test_accounting()
xfs_quota -c "quota -hnr -$type $id" $QARGS | filter_scratch
}
+export MOUNT_OPTIONS="-opquota"
+_require_prjquota
+_qmount
+
# real QA test starts here
rm -f $tmp.projects $seq.full
umount $SCRATCH_DEV 2>/dev/null
diff --git a/common.quota b/common.quota
index 868e563..1520df1 100644
--- a/common.quota
+++ b/common.quota
@@ -50,7 +50,8 @@ _require_xfs_quota()
#
_require_prjquota()
{
- src/feature -p $TEST_DEV
+ [ -n "$1" ] && _dev="$1" || _dev="$TEST_DEV"
+ src/feature -p $_dev
[ $? -ne 0 ] && _notrun "Installed kernel does not support project quotas"
}
--
1.7.2.2
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
