From 9f01882691bcfc2f48e3282d494706e1d58ab613 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 29 Jun 2007 16:06:04 +0000 Subject: [PATCH] For XFSQA test 018 081 082 095 the test specifies test wide mkfs options using MKFS_OPTIONS env var. 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. --- 018 | 3 +-- 018.out | 30 +++++++++++++++--------------- 081 | 5 ++--- 081.out | 2 +- 082 | 3 +-- 082.out | 38 +++++++++++++++++++------------------- 095 | 3 +-- common.log | 9 +++++---- 8 files changed, 45 insertions(+), 48 deletions(-) diff --git a/018 b/018 index c0aaf4be..ab23217b 100755 --- a/018 +++ b/018 @@ -69,9 +69,8 @@ do if [ "$mkfs" = "#" ]; then continue fi - export MKFS_OPTIONS="-l $mkfs" export MOUNT_OPTIONS="-o noalign,$mnt" - _mkfs_log + _mkfs_log "-l $mkfs" _create_log _check_log diff --git a/018.out b/018.out index 549111e1..53840f0d 100644 --- a/018.out +++ b/018.out @@ -1,17 +1,17 @@ QA output created by 018 *** init FS -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-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_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=1.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=32k.mkfs-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_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=32k.mkfs-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=64k.mkfs-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_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=64k.mkfs-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=128k.mkfs-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_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=128k.mkfs-lversion=2.filtered -*** compare logprint: 018.op with 018.fulldir/op.mnt-onoalign,logbsize=256k.mkfs-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_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lversion=2.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-lsize=2000b-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-lsize=2000b-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-lsize=2000b-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-lsize=2000b-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-lsize=2000b-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-lsize=2000b-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-lsize=2000b-lversion=2.filtered +*** compare logprint: 018.trans_buf with 018.fulldir/trans_buf.mnt-onoalign,logbsize=256k.mkfs-lsize=2000b-lversion=2.filtered diff --git a/081 b/081 index ea290536..037f81ce 100755 --- a/081 +++ b/081 @@ -48,7 +48,6 @@ umount $SCRATCH_DEV >/dev/null 2>&1 # do a simple quota test to ensure DQUOT data is happening -export MKFS_OPTIONS="-l version=1" export MOUNT_OPTIONS="-o quota,gquota" if [ "$HOSTOS" = "IRIX" ]; then @@ -58,12 +57,12 @@ else fi # mount with quotas? -_scratch_mkfs_xfs 1>/dev/null 2>&1 +_scratch_mkfs_xfs "-l version=1" 1>/dev/null 2>&1 _qmount src/feature -u $SCRATCH_DEV || _notrun "No quota support at mount time" umount $SCRATCH_MNT -_mkfs_log +_mkfs_log "-l version=1" _create_log _check_log _print_transaction_inode $start diff --git a/081.out b/081.out index 239ea88a..bf533a41 100644 --- a/081.out +++ b/081.out @@ -1,4 +1,4 @@ QA output created by 081 *** 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 diff --git a/082 b/082 index 3ba01332..1d4e6d47 100755 --- a/082 +++ b/082 @@ -81,9 +81,8 @@ for s in sync nosync ; do start=0 fi echo "--- mkfs=$mkfs, mnt=$mnt, sync=$s ---" - export MKFS_OPTIONS="-l $mkfs" export MOUNT_OPTIONS="-o $mnt" - if ! _mkfs_log; then + if ! _mkfs_log "-l $mkfs"; then continue fi if [ $s = "sync" ]; then diff --git a/082.out b/082.out index c7530963..e875ab5d 100644 --- a/082.out +++ b/082.out @@ -1,39 +1,39 @@ QA output created by 082 *** init FS --- 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_buf with 082.fulldir/trans_buf.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-lsize=2000b-lversion=2.sync.filtered --- 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_buf with 082.fulldir/trans_buf.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-lsize=2000b-lversion=2,su=4096.sync.filtered --- 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_buf with 082.fulldir/trans_buf.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-lsize=2000b-lversion=2,su=32768.sync.filtered --- 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 --- -*** 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 --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-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_buf with 082.fulldir/trans_buf.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-lsize=2000b-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 --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-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_buf with 082.fulldir/trans_buf.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-lsize=2000b-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 --- -*** compare logprint: 082.op with 082.fulldir/op.mnt-ologbsize=32k.mkfs-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_buf with 082.fulldir/trans_buf.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-lsize=2000b-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 --- -*** 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 --- -*** 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 *** diff --git a/095 b/095 index c331622a..0675f649 100755 --- a/095 +++ b/095 @@ -37,12 +37,11 @@ _supported_os IRIX _require_scratch _require_v2log -export MKFS_OPTIONS="-l version=1" export MOUNT_OPTIONS="-o logbsize=64k" # try and mount a v1 log with a v2 LRsize # expect failure -_mkfs_log +_mkfs_log "-l version=1" _create_log # now make the fs a v2 fs and try to mount again diff --git a/common.log b/common.log index f98693e1..1f5ad723 100644 --- a/common.log +++ b/common.log @@ -266,11 +266,12 @@ _print_transaction_buf() _mkfs_log() { # create the FS + # mkfs options to append to log size otion can be specified ($*) + export MKFS_OPTIONS="-l size=2000b $*" _full "mkfs" - extra_ops="-l size=2000b" - _scratch_mkfs_xfs $extra_ops >>$seq.full 2>&1 + _scratch_mkfs_xfs >>$seq.full 2>&1 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 fi @@ -428,7 +429,7 @@ _require_v2log() { # test out mkfs to see if it supports "-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" fi -- 2.30.2