apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

xfstests: Decomplicate quota setup in 050

Browse Source 
Only test 050 uses the _qsetup function, and it only uses the ID
part of it in the test. The attempts to link output files is useless
as there are no different output files used by the test.

Hence kill the _qsetup function, and move the code into test 050,
simplifying it down to the minimum needed.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Phil White <pwhite@sgi.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Dave Chinner
2013-03-15 12:28:07 +00:00
committed by Rich Johnston
parent e5c7cd83c4
commit 9a3a7a1568
2 changed files with 28 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/quota
+1 -46
View File
@@ -92,7 +92,7 @@ _require_nobody()
#
_file_as_id()
{
[ $# != 5 ] && _notrun "broken call to _file_as_id in test $seq"
[ $# != 5 ] && _fail "broken call to _file_as_id in test $seq"
parent=`dirname $1`
if [ $3 = p ]; then
@@ -157,51 +157,6 @@ _qmount()
chmod ugo+rwx $SCRATCH_MNT
}
_qsetup()
{
# setup exactly what it is we'll be testing
enforce=1
if src/feature -u $SCRATCH_DEV
then
type=u ;
eval `_choose_uid`
[ ! -f $seq.out ] && ln -s $seq.usrquota $seq.out
elif src/feature -g $SCRATCH_DEV
then
type=g
eval `_choose_gid`
[ ! -f $seq.out ] && ln -s $seq.grpquota $seq.out
elif src/feature -p $SCRATCH_DEV
then
type=p
eval `_choose_prid`
[ ! -f $seq.out ] && ln -s $seq.prjquota $seq.out
elif src/feature -U $SCRATCH_DEV
then
type=u
eval `_choose_uid`
[ ! -f $seq.out ] && ln -s $seq.uqnoenforce $seq.out
enforce=0
elif src/feature -G $SCRATCH_DEV
then
type=g
eval `_choose_gid`
[ ! -f $seq.out ] && ln -s $seq.gqnoenforce $seq.out
enforce=0
elif src/feature -P $SCRATCH_DEV
then
type=p
eval `_choose_prid`
[ ! -f $seq.out ] && ln -s $seq.pqnoenforce $seq.out
enforce=0
else
_notrun "No quota support at mount time"
fi
echo "Using output from '" `ls -l $seq.out` "'" >>$seqres.full
echo "and using type=$type id=$id" >>$seqres.full
}
#
# Ensures only the given quota mount option is used
#