diff mbox series

[02/17] xfs/419: use _scratch_mkfs_xfs

Message ID 20250312064541.664334-3-hch@lst.de (mailing list archive)
State New
Headers show
Series [01/17] xfs/177: force a small file system size | expand

Commit Message

Christoph Hellwig March 12, 2025, 6:44 a.m. UTC
So that the test is _notrun instead of failed for conflicting options.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/xfs/419 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Darrick J. Wong March 12, 2025, 8:05 p.m. UTC | #1
On Wed, Mar 12, 2025 at 07:44:54AM +0100, Christoph Hellwig wrote:
> So that the test is _notrun instead of failed for conflicting options.

Which options are those?  I'm assuming that you're forcing -r zoned=1?

> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/419 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/419 b/tests/xfs/419
> index b9cd21faf443..5e122a0b8763 100755
> --- a/tests/xfs/419
> +++ b/tests/xfs/419
> @@ -39,7 +39,7 @@ $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \
>  	echo "mkfs should succeed with uninheritable rtext-unaligned extent hint"
>  
>  # Move on to checking the kernel's behavior
> -_scratch_mkfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs
> +_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs

Yeah, seems fine to me -- if we didn't get the extsize=7b then the test
would have aborted anyway.

Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>

--D

>  cat $tmp.mkfs >> $seqres.full
>  . $tmp.mkfs
>  _scratch_mount
> -- 
> 2.45.2
> 
>
Christoph Hellwig March 13, 2025, 7:24 a.m. UTC | #2
On Wed, Mar 12, 2025 at 01:05:12PM -0700, Darrick J. Wong wrote:
> On Wed, Mar 12, 2025 at 07:44:54AM +0100, Christoph Hellwig wrote:
> > So that the test is _notrun instead of failed for conflicting options.
> 
> Which options are those?  I'm assuming that you're forcing -r zoned=1?

Yes.
diff mbox series

Patch

diff --git a/tests/xfs/419 b/tests/xfs/419
index b9cd21faf443..5e122a0b8763 100755
--- a/tests/xfs/419
+++ b/tests/xfs/419
@@ -39,7 +39,7 @@  $MKFS_XFS_PROG -d rtinherit=0 "${mkfs_args[@]}" &>> $seqres.full || \
 	echo "mkfs should succeed with uninheritable rtext-unaligned extent hint"
 
 # Move on to checking the kernel's behavior
-_scratch_mkfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs
+_scratch_mkfs_xfs -r extsize=7b | _filter_mkfs >> $seqres.full 2> $tmp.mkfs
 cat $tmp.mkfs >> $seqres.full
 . $tmp.mkfs
 _scratch_mount