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

xfs: don't output mkfs sector sizes into golden output

Browse Source 
The mkfs sector sizes are dependent on the underlying device in use,
and so is not fixed. hence it needs to be filtered from any golden
output file, otherwise tests that just differ by sector size will
fail.

Signed-off-by: Dave Chinner <dchinner@redhat.com>
Reviewed-by: Brian Foster <bfoster@redhat.com>
Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
Dave Chinner
2015-03-18 14:54:30 +11:00
committed by Dave Chinner
parent d0a3cc5af8
commit 354108ebb9
4 changed files with 36 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/xfs/096
+6 -2
View File
@@ -47,6 +47,8 @@ _cleanup()
# #
# filter out counts which will vary # filter out counts which will vary
# - extsz, blocks, agsize, agcount, device name, rtextents # - extsz, blocks, agsize, agcount, device name, rtextents
# - log version varies for crc enabled fs
# - lsunit varies for 512/4k sector devices
# filter out differences between linux and irix: # filter out differences between linux and irix:
# - sectsz on Linux # - sectsz on Linux
# - mmr, mixed-case on IRIX # - mmr, mixed-case on IRIX
@@ -63,7 +65,7 @@ _cleanup()
# = sunit=0 blks # = sunit=0 blks
# realtime =none extsz=65536 blocks=N, rtextents=N # realtime =none extsz=65536 blocks=N, rtextents=N
# #
_mkfs_filter() mkfs_filter()
{ {
tee -a $seqres.full | \ tee -a $seqres.full | \
sed \ sed \
@@ -80,6 +82,8 @@ _mkfs_filter()
-e '/ *= *mmr=[0-9][0-9]* *$/d' \ -e '/ *= *mmr=[0-9][0-9]* *$/d' \
-e 's/ *mixed-case=[YN]//' \ -e 's/ *mixed-case=[YN]//' \
-e 's/ *ascii-ci=[01]//' \ -e 's/ *ascii-ci=[01]//' \
-e 's/\(version=\)\([12]\)/\1N/' \
-e 's/\(sunit=\)\([018] blks\)/\1N blks/' \
-e 's/sectsz=[0-9][0-9]* *//' \ -e 's/sectsz=[0-9][0-9]* *//' \
-e 's/, lazy-count.*//' \ -e 's/, lazy-count.*//' \
-e '/inode-paths/d' \ -e '/inode-paths/d' \
@@ -145,7 +149,7 @@ do
fi fi
echo "--- mkfs=$mkfs ---" echo "--- mkfs=$mkfs ---"
export MKFS_OPTIONS="$mkfs" export MKFS_OPTIONS="$mkfs"
_scratch_mkfs_xfs 2>&1 | _mkfs_filter _scratch_mkfs_xfs 2>&1 | mkfs_filter
echo "" echo ""
echo "" echo ""
done done
tests/xfs/096.external
+7 -8
View File
@@ -11,8 +11,7 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=0 swidth=0 blks, unwritten=1 = sunit=0 swidth=0 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=2 log =LOG bsize=4096 blocks=N, version=N
= sunit=8 blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -22,8 +21,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=2 log =LOG bsize=4096 blocks=N, version=N
= sunit=0 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -33,8 +32,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=1 log =LOG bsize=4096 blocks=N, version=N
= sunit=0 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -44,8 +43,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=1 log =LOG bsize=4096 blocks=N, version=N
= sunit=0 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
tests/xfs/096.internal
+8 -8
View File
@@ -11,8 +11,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=0 swidth=0 blks, unwritten=1 = sunit=0 swidth=0 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=2 log =LOG bsize=4096 blocks=N, version=N
= sunit=8 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -22,8 +22,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=2 log =LOG bsize=4096 blocks=N, version=N
= sunit=8 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -33,8 +33,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=1 log =LOG bsize=4096 blocks=N, version=N
= sunit=0 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
@@ -44,8 +44,8 @@ meta-data=DEV isize=256 agcount=N, agsize=N blks
data = bsize=4096 blocks=N, imaxpct=N data = bsize=4096 blocks=N, imaxpct=N
= sunit=65 swidth=65 blks, unwritten=1 = sunit=65 swidth=65 blks, unwritten=1
naming =version 2 bsize=4096 naming =version 2 bsize=4096
log =LOG bsize=4096 blocks=N, version=1 log =LOG bsize=4096 blocks=N, version=N
= sunit=0 blks = sunit=N blks
realtime =REALTIME extsz=N, blocks=N, rtextents=N realtime =REALTIME extsz=N, blocks=N, rtextents=N
tests/xfs/206
+15 -18
View File
@@ -73,34 +73,31 @@ echo "=== truncate file ==="
dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \ dd if=/dev/zero of=$tmpfile bs=1 seek=19998630180864 count=1 >/dev/null 2>&1 \
|| _fail "!!! failed to truncate loopback file to correct size" || _fail "!!! failed to truncate loopback file to correct size"
mkfs_filter()
{
sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "s/\(sectsz\)\(=[0-9]* *\)/\1=512 /" \
-e "s/\(sunit=\)\([0-9]* blks,\)/\10 blks,/" \
-e "/.*crc=/d"
}
# mkfs slightly smaller than that # mkfs slightly smaller than that
echo "=== mkfs.xfs ===" echo "=== mkfs.xfs ==="
mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b -llazy-count=0 $tmpfile \ mkfs.xfs -f -bsize=4096 -dagsize=76288719b,size=3905982455b \
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \ -llazy-count=0 $tmpfile | mkfs_filter
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount" mount -o loop $tmpfile $tmpdir || _fail "!!! failed to loopback mount"
# see what happens when we growfs it # see what happens when we growfs it
echo "=== xfs_growfs ===" echo "=== xfs_growfs ==="
xfs_growfs $tmpdir \ xfs_growfs $tmpdir | mkfs_filter
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
# and double-check the new geometry # and double-check the new geometry
echo "=== xfs_info ===" echo "=== xfs_info ==="
xfs_info $tmpdir \ xfs_info $tmpdir | mkfs_filter
| sed -e "s,^meta-data=.*isize,meta-data=FILE isize,g" \
-e "s/\(^log.*blocks=\)\([0-9]*,\)/\1XXXXX,/" \
-e "s/, projid32bit=[0-9]//" \
-e "s/ ftype=[0-9]//" \
-e "/.*crc=/d"
# _cleanup cleans up for us # _cleanup cleans up for us