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

For XFSQA test 018 081 082 095 the test specifies test wide mkfs options using MKFS_OPTIONS env var.

Browse Source 
Further mkfs options are then appended by _mkfs_log at mkfs time with _scratch_mkfs_xfs.

Currently there are a few ways mkfs options are specified in XFSQA:
1) suite wide MKFS_OPTIONS are specified before tests are run
        e.g.
        vimes:/home/fsgqa/kali/xfsqa/xfstests # export MKFS_OPTIONS="-l size=100m"

2) test wide MKFS_OPTIONS are specified during a particular test
        e.g. 119
        export MKFS_OPTIONS="-l version=2,size=1200b,su=64k"

3) mkfs options are appended by a test at mkfs time
        e.g.  083
        _scratch_mkfs_xfs -dsize=$fsz,agcount=$ags  >>$seq.full

(4) Another form of appending is just appending to MKFS_OPTIONS directly
        e.g.    114:export MKFS_OPTIONS="$MKFS_OPTIONS -i parent=1"
                115:export MKFS_OPTIONS="$MKFS_OPTIONS -i paths=1"


e.g. Methods (2) *and* (3) for specifiying mkfs options are used in these tests.
This causes problems, because the mkfs options fallback code assumes the
_mkfs_log _scratch_mkfs_xfs appended options are the only test specified options.

This change causes tests using _mkfs_log to only use option (2).
~
~
Merge of master-melb:xfs-cmds:29031a by kenmcd.
This commit is contained in:
David Disseldorp
2007-06-29 16:06:04 +00:00
parent dd3adfb6f0
commit 9f01882691
8 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
018
+1 -2
View File
@@ -69,9 +69,8 @@ do
if [ "$mkfs" = "#" ]; then if [ "$mkfs" = "#" ]; then
continue continue
fi fi
export MKFS_OPTIONS="-l $mkfs"
export MOUNT_OPTIONS="-o noalign,$mnt" export MOUNT_OPTIONS="-o noalign,$mnt"
_mkfs_log _mkfs_log "-l $mkfs"
_create_log _create_log
_check_log _check_log
018.out
+15 -15
View File
@@ -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-onoalign,logbsize=32k.mkfs-lversion=1.filtered *** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered *** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered *** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=1.filtered
*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered *** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered *** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered *** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered *** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_inode with 018.fulldir/trans_inode.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered
*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lversion=2.filtered *** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered
081
+2 -3
View File
@@ -48,7 +48,6 @@ umount $SCRATCH_DEV >/dev/null 2>&1
# do a simple quota test to ensure DQUOT data is happening # do a simple quota test to ensure DQUOT data is happening
export MKFS_OPTIONS="-l version=1"
export MOUNT_OPTIONS="-o quota,gquota" export MOUNT_OPTIONS="-o quota,gquota"
if [ "$HOSTOS" = "IRIX" ]; then if [ "$HOSTOS" = "IRIX" ]; then
@@ -58,12 +57,12 @@ else
fi fi
# mount with quotas? # mount with quotas?
_scratch_mkfs_xfs 1>/dev/null 2>&1 _scratch_mkfs_xfs "-l version=1" 1>/dev/null 2>&1
_qmount _qmount
src/feature -u $SCRATCH_DEV || _notrun "No quota support at mount time" src/feature -u $SCRATCH_DEV || _notrun "No quota support at mount time"
umount $SCRATCH_MNT umount $SCRATCH_MNT
_mkfs_log _mkfs_log "-l version=1"
_create_log _create_log
_check_log _check_log
_print_transaction_inode $start _print_transaction_inode $start
081.out
+1 -1
View File
@@ -1,4 +1,4 @@
QA output created by 081 QA output created by 081
*** init FS *** init FS
*** compare logprint: 081.ugquota.trans_inode with 081.fulldir/trans_inode.mnt-oquota,gquota.mkfs-lversion=1.filtered *** compare logprint: 081.ugquota.trans_inode with 081.fulldir/trans_inode.mnt-oquota,gquota.mkfs-lsize=2000b-lversion=1.filtered
*** unmount *** unmount
082
+1 -2
View File
@@ -81,9 +81,8 @@ for s in sync nosync ; do
start=0 start=0
fi fi
echo "--- mkfs=$mkfs, mnt=$mnt, sync=$s ---" echo "--- mkfs=$mkfs, mnt=$mnt, sync=$s ---"
export MKFS_OPTIONS="-l $mkfs"
export MOUNT_OPTIONS="-o $mnt" export MOUNT_OPTIONS="-o $mnt"
if ! _mkfs_log; then if ! _mkfs_log "-l $mkfs"; then
continue continue
fi fi
if [ $s = "sync" ]; then if [ $s = "sync" ]; then
082.out
+19 -19
View File
@@ -1,39 +1,39 @@
QA output created by 082 QA output created by 082
*** init FS *** init FS
--- mkfs=version=2, mnt=logbsize=32k, sync=sync --- --- mkfs=version=2, mnt=logbsize=32k, sync=sync ---
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2.sync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.sync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2.sync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.sync.filtered
--- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=sync --- --- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=sync ---
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.sync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.sync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.sync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.sync.filtered
--- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=sync --- --- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=sync ---
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.sync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.sync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.sync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.sync.filtered
--- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=sync --- --- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=sync ---
*** Cannot mkfs for this test using option specified: -l version=2,su=36864 -l size=2000b *** *** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=36864 ***
--- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=sync --- --- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=sync ---
*** Cannot mkfs for this test using option specified: -l version=2,su=5120 -l size=2000b *** *** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=5120 ***
--- mkfs=version=2, mnt=logbsize=32k, sync=nosync --- --- mkfs=version=2, mnt=logbsize=32k, sync=nosync ---
*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2.nosync.filtered *** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2.nosync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2.nosync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2.nosync.filtered
--- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=nosync --- --- mkfs=version=2,su=4096, mnt=logbsize=32k, sync=nosync ---
*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.nosync.filtered *** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.nosync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=4096.nosync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=4096.nosync.filtered
--- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=nosync --- --- mkfs=version=2,su=32768, mnt=logbsize=32k, sync=nosync ---
*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.nosync.filtered *** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered
*** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.nosync.filtered *** compare logprint: 082.trans_inode with 082.fulldir/trans_inode.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered
*** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lversion=2,su=32768.nosync.filtered *** compare logprint: 082.trans_buf with 082.fulldir/trans_buf.mnt-ologbsize=32k.mkfs-lsize=2000b-lversion=2,su=32768.nosync.filtered
--- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=nosync --- --- mkfs=version=2,su=36864, mnt=logbsize=32k, sync=nosync ---
*** Cannot mkfs for this test using option specified: -l version=2,su=36864 -l size=2000b *** *** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=36864 ***
--- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=nosync --- --- mkfs=version=2,su=5120, mnt=logbsize=32k, sync=nosync ---
*** Cannot mkfs for this test using option specified: -l version=2,su=5120 -l size=2000b *** *** Cannot mkfs for this test using option specified: -l size=2000b -l version=2,su=5120 ***
095
+1 -2
View File
@@ -37,12 +37,11 @@ _supported_os IRIX
_require_scratch _require_scratch
_require_v2log _require_v2log
export MKFS_OPTIONS="-l version=1"
export MOUNT_OPTIONS="-o logbsize=64k" export MOUNT_OPTIONS="-o logbsize=64k"
# try and mount a v1 log with a v2 LRsize # try and mount a v1 log with a v2 LRsize
# expect failure # expect failure
_mkfs_log _mkfs_log "-l version=1"
_create_log _create_log
# now make the fs a v2 fs and try to mount again # now make the fs a v2 fs and try to mount again
common.log
+5 -4
View File
@@ -266,11 +266,12 @@ _print_transaction_buf()
_mkfs_log() _mkfs_log()
{ {
# create the FS # create the FS
# mkfs options to append to log size otion can be specified ($*)
export MKFS_OPTIONS="-l size=2000b $*"
_full "mkfs" _full "mkfs"
extra_ops="-l size=2000b" _scratch_mkfs_xfs >>$seq.full 2>&1
_scratch_mkfs_xfs $extra_ops >>$seq.full 2>&1
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
_echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS $extra_ops" _echofull "Cannot mkfs for this test using option specified: $MKFS_OPTIONS"
return 1 return 1
fi fi
@@ -428,7 +429,7 @@ _require_v2log()
{ {
# test out mkfs to see if it supports "-l version=2" # test out mkfs to see if it supports "-l version=2"
export MKFS_OPTIONS="-l version=2" export MKFS_OPTIONS="-l version=2"
if ! _scratch_mkfs_xfs $extra_ops >>$seq.full 2>&1; then if ! _scratch_mkfs_xfs >>$seq.full 2>&1; then
_notrun "mkfs does not support v2 logs" _notrun "mkfs does not support v2 logs"
fi fi