mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
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.
This commit is contained in:
+5
-4
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user