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: fix btrfs/006 for 10+ devices in SCRATCH_DEV_POOL

Browse Source 
One problem was the output of "uniq -c" which added spaces depending
on the size of the count value (e.g. one space less for 10+ devices).

The second problem was that "btrfs fi show" was doing the same:
"devid %4llu size %s used %s path %s".

Signed-off-by: Stefan Behrens <sbehrens@giantdisaster.de>
Reviewed-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Rich Johnston <rjohnston@sgi.com>
This commit is contained in:
Stefan Behrens
2013-08-23 13:07:13 +00:00
committed by Rich Johnston
parent f1dce456c5
commit 0d3bbd1894
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/filter.btrfs
+2 -2
View File
@@ -10,7 +10,7 @@ _filter_btrfs_version()
_filter_devid() _filter_devid()
{ {
sed -e "s/\(devid\s\+\)[0-9]\+/\1 <DEVID>/g" sed -e "s/\(devid\)\s\+[0-9]\+/\1 <DEVID>/g"
} }
# If passed a number as first arg, filter that number of devices # If passed a number as first arg, filter that number of devices
@@ -53,7 +53,7 @@ _filter_btrfs_device_stats()
_filter_scratch | _filter_scratch_pool | \ _filter_scratch | _filter_scratch_pool | \
sed -e "s/[0-9]\+$/<NUM>/g" | sort | uniq $UNIQ_OPT | \ sed -e "s/[0-9]\+$/<NUM>/g" | sort | uniq $UNIQ_OPT | \
sed -e "s/$NUMDEVS /<NUMDEVS> /g" sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
} }
# make sure this script returns success # make sure this script returns success
tests/btrfs/006.out
+7 -7
View File
@@ -6,21 +6,21 @@ TestLabel.006
== Show filesystem by label == Show filesystem by label
Label: 'TestLabel.006' uuid: <UUID> Label: 'TestLabel.006' uuid: <UUID>
Total devices <EXACTNUM> FS bytes used <SIZE> Total devices <EXACTNUM> FS bytes used <SIZE>
devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
== Show filesystem by UUID == Show filesystem by UUID
Label: 'TestLabel.006' uuid: <EXACTUUID> Label: 'TestLabel.006' uuid: <EXACTUUID>
Total devices <EXACTNUM> FS bytes used <SIZE> Total devices <EXACTNUM> FS bytes used <SIZE>
devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
== Sync filesystem == Sync filesystem
FSSync 'SCRATCH_MNT' FSSync 'SCRATCH_MNT'
== Show device stats by mountpoint == Show device stats by mountpoint
<NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM> <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM>
<NUMDEVS> [SCRATCH_DEV].flush_io_errs <NUM> <NUMDEVS> [SCRATCH_DEV].flush_io_errs <NUM>
<NUMDEVS> [SCRATCH_DEV].generation_errs <NUM> <NUMDEVS> [SCRATCH_DEV].generation_errs <NUM>
<NUMDEVS> [SCRATCH_DEV].read_io_errs <NUM> <NUMDEVS> [SCRATCH_DEV].read_io_errs <NUM>
<NUMDEVS> [SCRATCH_DEV].write_io_errs <NUM> <NUMDEVS> [SCRATCH_DEV].write_io_errs <NUM>
== Show device stats by first/scratch dev == Show device stats by first/scratch dev
[SCRATCH_DEV].corruption_errs <NUM> [SCRATCH_DEV].corruption_errs <NUM>
[SCRATCH_DEV].flush_io_errs <NUM> [SCRATCH_DEV].flush_io_errs <NUM>