common/quota: move _qsetup() helper to common code

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

diff --git a/tests/xfs/050 b/tests/xfs/050
index 53412a13a4e156a06c5083a81cb6c9068b451e38..e7c81d0a091e0b96dafeab28b6a7eacf81f48faa 100755 (executable)
--- a/tests/xfs/050
+++ b/tests/xfs/050
@@ -47,24 +47,6 @@ bhard=$(( 1000 * $bsize ))
 isoft=4
 ihard=10
 
-_filter_report()
-{
-       tr -s '[:space:]' | \
-       perl -npe '
-               s/^\#'$id' /[NAME] /g;
-               s/^\#0 \d+ /[ROOT] 0 /g;
-               s/6 days/7 days/g' |
-       perl -npe '
-               $val = 0;
-               if ($ENV{'LARGE_SCRATCH_DEV'}) {
-                       $val = $ENV{'NUM_SPACE_FILES'};
-               }
-               s/(^\[ROOT\] \S+ \S+ \S+ \S+ \[--------\] )(\S+)/$1@{[$2 - $val]}/g' |
-       sed -e 's/ 65535 \[--------\]/ 00 \[--------\]/g' |
-       perl -npe '
-               s|^(.*?) (\d+) (\d+) (\d+)|$1 @{[$2 * 1024 /'$bsize']} @{[$3 * 1024 /'$bsize']} @{[$4 * 1024 /'$bsize']}|'
-}
-
 # The actual point at which limit enforcement takes place for the
 # hard block limit is variable depending on filesystem blocksize,
 # and iosize.  What we want to test is that the limit is enforced
@@ -84,26 +66,7 @@ _filter_and_check_blks()
                        }
                        s/^(\#'$id'\s+)(\d+)/\1 =OK=/g;
                }
-       ' | _filter_report
-}
-
-_qsetup()
-{
-       opt=$1
-       enforce=0
-       if [ $opt = "u" -o $opt = "uno" ]; then
-               type=u
-               eval `_choose_uid`
-       elif [ $opt = "g" -o $opt = "gno" ]; then
-               type=g
-               eval `_choose_gid`
-       elif [ $opt = "p" -o $opt = "pno" ]; then
-               type=p
-               eval `_choose_prid`
-       fi
-       [ $opt = "u" -o $opt = "g" -o $opt = "p" ] && enforce=1
-
-       echo "Using type=$type id=$id" >> $seqres.full
+       ' | _filter_quota_report
 }
 
 _exercise()
@@ -134,7 +97,7 @@ _exercise()
        echo "*** report no quota settings" | tee -a $seqres.full
        $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
                -c "repquota -birnN -$type" $SCRATCH_DEV |
-               _filter_report | LC_COLLATE=POSIX sort -ru
+               _filter_quota_report | LC_COLLATE=POSIX sort -ru
 
        echo
        echo "*** report initial settings" | tee -a $seqres.full
@@ -147,7 +110,7 @@ _exercise()
                $SCRATCH_DEV
        $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
                -c "repquota -birnN -$type" $SCRATCH_DEV |
-               _filter_report | LC_COLLATE=POSIX sort -ru
+               _filter_quota_report | LC_COLLATE=POSIX sort -ru
 
        echo
        echo "*** push past the soft inode limit" | tee -a $seqres.full
@@ -159,7 +122,7 @@ _exercise()
        $XFS_QUOTA_PROG -x -c "warn -i -$type 0 $id" $SCRATCH_DEV
        $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
                -c "repquota -birnN -$type" $SCRATCH_DEV |
-               _filter_report | LC_COLLATE=POSIX sort -ru
+               _filter_quota_report | LC_COLLATE=POSIX sort -ru
 
        echo
        echo "*** push past the soft block limit" | tee -a $seqres.full
@@ -169,7 +132,7 @@ _exercise()
                -c "warn -b -$type 0 $id" $SCRATCH_DEV
        $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
                -c "repquota -birnN -$type" $SCRATCH_DEV |
-               _filter_report | LC_COLLATE=POSIX sort -ru
+               _filter_quota_report | LC_COLLATE=POSIX sort -ru
 
        echo
        # Note: for quota accounting (not enforcement), EDQUOT is not expected
@@ -183,7 +146,7 @@ _exercise()
                -c "warn -i -$type 0 $id" $SCRATCH_DEV
        $XFS_QUOTA_PROG -D $tmp.projects -P $tmp.projid -x \
                -c "repquota -birnN -$type" $SCRATCH_DEV |
-               _filter_report | LC_COLLATE=POSIX sort -ru
+               _filter_quota_report | LC_COLLATE=POSIX sort -ru
 
        echo
        # Note: for quota accounting (not enforcement), EDQUOT is not expected