do qa testing on the new quota userspace.

[xfstests-dev.git] / common.quota

diff --git a/common.quota b/common.quota
index 732fe8b12ef46666f5c7e83f170f8ad91f553447..98a77d39053ede6883caf13873c300520e44a5c2 100644 (file)
--- a/common.quota
+++ b/common.quota
@@ -42,9 +42,9 @@ _require_quota()
     src/feature -q $TEST_DEV
     [ $? -ne 0 ] && _notrun "Installed kernel does not support XFS quota"
 
-    [ ! -x /usr/sbin/repquota ] && _notrun "Quota user tools not installed"
+    [ ! -x /sbin/quotaon ] && _notrun "Quota user tools not installed"
 
-    /usr/sbin/repquota -m -s -a >/dev/null 2>&1
+    /sbin/quotaon -x 2>&1 | grep "option requires an argument -- x" >/dev/null
     [ $? -ne 0 ] && _notrun "Installed quota tools do not support XFS"
 }
 
@@ -92,7 +92,7 @@ _qmount()
     umount $SCRATCH_DEV >/dev/null 2>&1
     mount -t xfs $SCRATCH_DEV $SCRATCH_MNT || _fail "qmount failed"
     chmod ugo+rwx $SCRATCH_MNT
-    misc/quot $SCRATCH_DEV >>$seq.full 2>&1
+    [ -x /usr/sbin/quot ] && quot $SCRATCH_DEV >>$seq.full 2>&1
 }
 
 # make sure this script returns success