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: handle xfs_quota output w/ long devicenames

Browse Source 
Long device names may be split onto their own line
on quota output:

Filesystem   Blocks  Quota  Limit Warn/Time    Mounted on
/dev/mapper/my-very-very-very-long-devicename
                48M      0      0  00 [------] /mnt/scratch

which breaks tests that capture quota output - currently,
only xfs/108.

Add a _filter_quota() which fixes this.

Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Reviewed-by: Dave Chinner <dchinner@redhat.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Eric Sandeen
2013-10-06 22:46:19 +00:00
committed by Rich Johnston
parent fc671750a5
commit cd7eb340dd
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter
+9
View File
@@ -248,6 +248,15 @@ _filter_spaces()
sed -e 's/ [ ]*/ /g' sed -e 's/ [ ]*/ /g'
} }
_filter_quota()
{
# Long dev name might be split onto its own line; last
# seds remove that newline if present
_filter_scratch | _filter_test_dir | _filter_spaces | \
sed -e 'N;s/SCRATCH_DEV\n/SCRATCH_DEV/g' | \
sed -e 'N;s/TEST_DEV\n/TEST_DEV/g'
}
# Account for different "ln" failure messages # Account for different "ln" failure messages
_filter_ln() _filter_ln()
{ {
tests/xfs/108
+3 -3
View File
@@ -71,9 +71,9 @@ test_accounting()
for file in $SCRATCH_MNT/{buffer,direct,mmap}; do for file in $SCRATCH_MNT/{buffer,direct,mmap}; do
$here/src/lstat64 $file | head -3 | _filter_scratch $here/src/lstat64 $file | head -3 | _filter_scratch
done done
xfs_quota -c "quota -hnb -$type $id" $QARGS | _filter_scratch | _filter_spaces xfs_quota -c "quota -hnb -$type $id" $QARGS | _filter_quota
xfs_quota -c "quota -hni -$type $id" $QARGS | _filter_scratch | _filter_spaces xfs_quota -c "quota -hni -$type $id" $QARGS | _filter_quota
xfs_quota -c "quota -hnr -$type $id" $QARGS | _filter_scratch | _filter_spaces xfs_quota -c "quota -hnr -$type $id" $QARGS | _filter_quota
} }
export MOUNT_OPTIONS="-opquota" export MOUNT_OPTIONS="-opquota"