$MKFS_XFS_PROG $SCRATCH_OPTIONS $MKFS_OPTIONS $extra_mkfs_options $SCRATCH_DEV
local mkfs_status=$?
# a mkfs failure may be caused by conflicts between
# $MKFS_OPTIONS and $extra_mkfs_options
if [ $mkfs_status -ne 0 -a ! -z "$extra_mkfs_options" ]; then
echo "** mkfs failed with extra mkfs options added to \"$MKFS_OPTIONS\" by test $seq **" \
>>$here/$seq.full
echo "** attempting to mkfs using only test $seq options: $extra_mkfs_options **" \
>>$here/$seq.full
$MKFS_XFS_PROG $SCRATCH_OPTIONS $extra_mkfs_options $SCRATCH_DEV
mkfs_status=$?
fi
In the case of a failure caused by conflict between $MKFS_OPTIONS and $extra_mkfs_options,
the mkfs output is shown twice, first off is the failed mkfs output, secondly the resolved mkfs output.
This can cause QA failures for a number of tests, particularly those that filter the mkfs output.
This change shows only the applied (final) mkfs output from _scratch_mkfs_xfs.
Merge of master-melb:xfs-cmds:29041a by kenmcd.
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"
Conflicts between mkfs options specified with method 1 & 3 are common.
960377 XFSQA 041, 042 - mkfs fails with large log size MKFS_OPTIONS.
This change means if a mkfs fails where mkfs options have been appended by a test (method 3),
The mkfs is retried using only those options defined by the test.
occurances of method 4 (in test 114 & 115) are also changed to use method 3.
$seq.full logs the fact that a mkfs options conflict has occured.
Merge of master-melb:xfs-cmds:28601a by kenmcd.
append -i parent mkfs option using _scratch_mkfs_xfs -i parent...
rather than export MKFS_OPTIONS="$MKFS_OPTIONS -i parent=1.
this avoids mkfs option conflicts
- multiple -o's are not allowed
- no spaces between comma delimitered options
added sed script replaces all -o's (except the first) with a comma
Merge of master-melb:xfs-cmds:27184a by kenmcd.
process doesn't have FSETID and SETFCAP capabilities.
This is an IRIX only test.
This will check that pv#901019 changes are not stuffing up
what the code was supposed to do.
removal of file caps on write test - pv#901019
Want this to run in a reasonable time.
Make it have different params on IRIX vs Linux, debug versus non-debug.
And allow cmd arguments via getopt to try out different params
for timing.
David Disseldorp
Allan Randall
Lachlan McIlroy
Andrew Jones
Nathan Scott
Tim Shimmin
fsgqa
ptools