mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
Make test 018 work when underlying volume provides stripe alignment info to mkfs.
Merge of master-melb:xfs-cmds:25611a by kenmcd.
This commit is contained in:
@@ -37,7 +37,7 @@ _supported_os IRIX Linux
|
|||||||
# prelim
|
# prelim
|
||||||
rm -f $seq.full $tmp.*
|
rm -f $seq.full $tmp.*
|
||||||
_require_scratch
|
_require_scratch
|
||||||
_require_v2log
|
_require_v2log
|
||||||
|
|
||||||
# link correct .out file
|
# link correct .out file
|
||||||
_link_out_file $seq.op
|
_link_out_file $seq.op
|
||||||
@@ -55,7 +55,7 @@ cat >$tmp.seq.params <<EOF
|
|||||||
version=2 logbsize=256k
|
version=2 logbsize=256k
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
if [ "$HOSTOS" = "IRIX" ]; then
|
if [ "$HOSTOS" = "IRIX" ]; then
|
||||||
start_blk=0
|
start_blk=0
|
||||||
else
|
else
|
||||||
start_blk=2
|
start_blk=2
|
||||||
@@ -66,10 +66,10 @@ fi
|
|||||||
cat $tmp.seq.params \
|
cat $tmp.seq.params \
|
||||||
| while read mkfs mnt
|
| while read mkfs mnt
|
||||||
do
|
do
|
||||||
if [ "$mkfs" = "#" ]; then
|
if [ "$mkfs" = "#" ]; then
|
||||||
continue
|
continue
|
||||||
fi
|
fi
|
||||||
export MKFS_OPTIONS="-l $mkfs"
|
export MKFS_OPTIONS="-d noalign -l $mkfs"
|
||||||
export MOUNT_OPTIONS="-o $mnt"
|
export MOUNT_OPTIONS="-o $mnt"
|
||||||
_mkfs_log
|
_mkfs_log
|
||||||
_create_log
|
_create_log
|
||||||
|
|||||||
@@ -1,17 +1,17 @@
|
|||||||
QA output created by 018
|
QA output created by 018
|
||||||
*** init FS
|
*** init FS
|
||||||
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=1.filtered
|
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
|
||||||
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=1.filtered
|
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
|
||||||
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=1.filtered
|
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=1.filtered
|
||||||
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=64k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=64k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=64k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=64k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=128k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=128k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=128k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=128k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=256k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.op with 018.fulldir/op.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=256k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
|
||||||
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=256k.mkfs-lversion=2.filtered
|
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-ologbsize=256k.mkfs-dnoalign-lversion=2.filtered
|
||||||
|
|||||||
Reference in New Issue
Block a user