public inbox for linux-xfs@vger.kernel.org
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: Zorro Lang <zlang@kernel.org>
Cc: "Darrick J. Wong" <djwong@kernel.org>,
	fstests@vger.kernel.org, linux-xfs@vger.kernel.org
Subject: [PATCH 4/4] xfs/516: use _scratch_mkfs_xfs
Date: Wed,  7 Aug 2024 07:35:10 -0700	[thread overview]
Message-ID: <20240807143519.2900711-5-hch@lst.de> (raw)
In-Reply-To: <20240807143519.2900711-1-hch@lst.de>

Use _scratch_mkfs_xfs instead of _scratch_mkfs to get _notrun handling
for unsupported option combinations.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/516 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/xfs/516 b/tests/xfs/516
index e52779cf3..882ba48e8 100755
--- a/tests/xfs/516
+++ b/tests/xfs/516
@@ -72,7 +72,7 @@ __test_mount_opts()
 test_sunit_opts()
 {
 	echo "Format with 4k stripe unit; 1x stripe width" >> $seqres.full
-	_scratch_mkfs -b size=4k -d sunit=8,swidth=8 >> $seqres.full 2>&1
+	_scratch_mkfs_xfs -b size=4k -d sunit=8,swidth=8 >> $seqres.full 2>&1
 
 	__test_mount_opts "$@"
 }
@@ -82,7 +82,7 @@ test_su_opts()
 	local mounted=0
 
 	echo "Format with 256k stripe unit; 4x stripe width" >> $seqres.full
-	_scratch_mkfs -b size=1k -d su=256k,sw=4 >> $seqres.full 2>&1
+	_scratch_mkfs_xfs -b size=1k -d su=256k,sw=4 >> $seqres.full 2>&1
 
 	__test_mount_opts "$@"
 }
@@ -92,7 +92,7 @@ test_repair_detection()
 	local mounted=0
 
 	echo "Format with 256k stripe unit; 4x stripe width" >> $seqres.full
-	_scratch_mkfs -b size=1k -d su=256k,sw=4 >> $seqres.full 2>&1
+	_scratch_mkfs_xfs -b size=1k -d su=256k,sw=4 >> $seqres.full 2>&1
 
 	# Try to mount the fs with our test options.
 	_try_scratch_mount >> $seqres.full 2>&1 && mounted=1
-- 
2.43.0


  parent reply	other threads:[~2024-08-07 14:35 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-08-07 14:35 don't fail tests when mkfs options collide Christoph Hellwig
2024-08-07 14:35 ` [PATCH 1/4] common: _notrun if _scratch_mkfs_sized failed Christoph Hellwig
2024-08-07 14:35 ` [PATCH 2/4] common: _notrun if _scratch_mkfs_xfs failed Christoph Hellwig
2024-08-07 14:35 ` [PATCH 3/4] xfs/432: use _scratch_mkfs_xfs Christoph Hellwig
2024-08-07 14:35 ` Christoph Hellwig [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-07-23  0:00 RFC: don't fail tests when mkfs options collide Christoph Hellwig
2024-07-23  0:00 ` [PATCH 4/4] xfs/516: use _scratch_mkfs_xfs Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240807143519.2900711-5-hch@lst.de \
    --to=hch@lst.de \
    --cc=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=linux-xfs@vger.kernel.org \
    --cc=zlang@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox