mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Fix coupel of newer tests to work with external log/rt devices too.
Merge of master-melb:xfs-cmds:26371a by kenmcd.
This commit is contained in:
@@ -66,6 +66,7 @@ _mkfs_filter()
|
|||||||
-e 's/, lazy-count.*//' \
|
-e 's/, lazy-count.*//' \
|
||||||
-e '/inode-paths/d' \
|
-e '/inode-paths/d' \
|
||||||
-e 's/\(log[ ]*=\).*bsize/\1LOG bsize/' \
|
-e 's/\(log[ ]*=\).*bsize/\1LOG bsize/' \
|
||||||
|
-e 's/\(realtime[ ]*=\).*extsz/\1REALTIME extsz/' \
|
||||||
-e 's/ *$//' \
|
-e 's/ *$//' \
|
||||||
| grep -v parent
|
| grep -v parent
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-4
@@ -15,7 +15,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=2
|
||||||
= sunit=8 blks
|
= sunit=8 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# same test but get log stripe from data stripe
|
# same test but get log stripe from data stripe
|
||||||
@@ -26,7 +26,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=2
|
||||||
= sunit=0 blks
|
= sunit=0 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# test out data stripe
|
# test out data stripe
|
||||||
@@ -37,7 +37,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=1
|
||||||
= sunit=0 blks
|
= sunit=0 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# test out data stripe the same but using sunit & swidth
|
# test out data stripe the same but using sunit & swidth
|
||||||
@@ -48,6 +48,6 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=1
|
||||||
= sunit=0 blks
|
= sunit=0 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
+4
-4
@@ -15,7 +15,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=2
|
||||||
= sunit=8 blks
|
= sunit=8 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# same test but get log stripe from data stripe
|
# same test but get log stripe from data stripe
|
||||||
@@ -28,7 +28,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=2
|
||||||
= sunit=8 blks
|
= sunit=8 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# test out data stripe
|
# test out data stripe
|
||||||
@@ -39,7 +39,7 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=1
|
||||||
= sunit=0 blks
|
= sunit=0 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
# test out data stripe the same but using sunit & swidth
|
# test out data stripe the same but using sunit & swidth
|
||||||
@@ -50,6 +50,6 @@ data = bsize=4096 blocks=N, imaxpct=25
|
|||||||
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=1
|
||||||
= sunit=0 blks
|
= sunit=0 blks
|
||||||
realtime =none extsz=65536 blocks=N, rtextents=N
|
realtime =REALTIME extsz=65536 blocks=N, rtextents=N
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ echo "logprint after going down..."
|
|||||||
_print_logstate
|
_print_logstate
|
||||||
|
|
||||||
echo "logprint to check for CLEAR_AGI_BUCKET..."
|
echo "logprint to check for CLEAR_AGI_BUCKET..."
|
||||||
xfs_logprint -t $SCRATCH_DEV | grep CLEAR
|
_scratch_xfs_logprint -t | grep CLEAR
|
||||||
|
|
||||||
# success, all done
|
# success, all done
|
||||||
status=0
|
status=0
|
||||||
|
|||||||
Reference in New Issue
Block a user