On Mon, Jul 22, 2024 at 05:00:33PM -0700, Christoph Hellwig wrote: > If we fail to create a file system with specific passed in options, that > that these options conflict with other options $MKFS_OPTIONS. Don't > fail the test case for that, but instead _norun it and display the options > that caused it to fail. > > Add a lower-level _try_scratch_mkfs_xfs helper for those places that want > to check the return value. > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- [snip] > diff --git a/tests/xfs/178 b/tests/xfs/178 > index e7d1cb0e0..0cc0e3f5b 100755 > --- a/tests/xfs/178 > +++ b/tests/xfs/178 > @@ -52,7 +52,6 @@ _dd_repair_check() > _require_scratch > _scratch_xfs_force_no_metadir ^^^^^ I tried to merge this patch, as it's a xfs particular change, and xfs folks acked it and would like to give it a try. But this line blocks the merging process. I can't find "_scratch_xfs_force_no_metadir" in xfs/178, and even the whole xfstests. Could you help to rebase this patchset on offical xfstests for-next branch, then send it again? This patch is too big, It's hard for me to merge it manually ( I'm glad to know if there's an easy way to deal with this conflict manually :) Thanks, Zorro > _scratch_mkfs_xfs | _filter_mkfs 2>$tmp.mkfs > -test "${PIPESTATUS[0]}" -eq 0 || _fail "mkfs failed!" > > # By executing the followint tmp file, will get on the mkfs options stored in > # variables > @@ -61,7 +60,7 @@ test "${PIPESTATUS[0]}" -eq 0 || _fail "mkfs failed!" > # if the default agcount is too small, bump it up and re-mkfs before testing > if [ $agcount -lt 8 ]; then > agcount=8 > - _scratch_mkfs_xfs -dagcount=$agcount >/dev/null 2>&1 \ > + _try_scratch_mkfs_xfs -dagcount=$agcount >/dev/null 2>&1 \ > || _notrun "Test requires at least 8 AGs." > fi > > @@ -69,8 +68,7 @@ _dd_repair_check $SCRATCH_DEV $sectsz > > # smaller AGCOUNT > let "agcount=$agcount-2" > -_scratch_mkfs_xfs -dagcount=$agcount >/dev/null 2>&1 \ > - || _fail "mkfs failed!" > +_scratch_mkfs_xfs -dagcount=$agcount >/dev/null 2>&1 > > _dd_repair_check $SCRATCH_DEV $sectsz > [snip]