xfs/518: modify timer/state commands to remove new g,p timer output

[xfstests-dev.git] / tests / xfs / 518

diff --git a/tests/xfs/518 b/tests/xfs/518
index 144579788e90ec7edbc4942842b29611ed85787f..c49c4e4d48d798d54e516780f0411de254e76e65 100755 (executable)
--- a/tests/xfs/518
+++ b/tests/xfs/518
@@ -30,6 +30,7 @@ _cleanup()
 # real QA test starts here
 _supported_fs xfs
 _supported_os Linux
+_require_scratch
 _require_quota
 
 rm -f $seqres.full
@@ -40,12 +41,12 @@ _qmount_option "usrquota"
 _scratch_mount >> $seqres.full
 
 $XFS_QUOTA_PROG -x -c 'timer -u 300m' $SCRATCH_MNT
-$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time'
+$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time'
 _scratch_unmount
 
 # Remount and check the limits
 _scratch_mount >> $seqres.full
-$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time'
+$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time'
 _scratch_unmount
 
 # Run repair to force quota check
@@ -56,12 +57,12 @@ _scratch_xfs_repair >> $seqres.full 2>&1
 # while the incore copy stays at whatever was read in prior to quotacheck.
 # This will show up after the /next/ remount.
 _scratch_mount >> $seqres.full
-$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time'
+$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time'
 _scratch_unmount
 
 # Remount and check the limits
 _scratch_mount >> $seqres.full
-$XFS_QUOTA_PROG -x -c 'state' $SCRATCH_MNT | grep 'grace time'
+$XFS_QUOTA_PROG -x -c 'state -u' $SCRATCH_MNT | grep 'grace time'
 _scratch_unmount
 
 # success, all done