xfstests: fix btrfs/006 for 10+ devices in SCRATCH_DEV_POOL

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
+2 -2
View File
@@ -10,7 +10,7 @@ _filter_btrfs_version()
_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
@@ -53,7 +53,7 @@ _filter_btrfs_device_stats()
_filter_scratch | _filter_scratch_pool | \
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