diff mbox series

xfs/262: call _supports_xfs_scrub

Message ID 20240110174544.2007727-1-hch@lst.de (mailing list archive)
State New, archived
Headers show
Series xfs/262: call _supports_xfs_scrub | expand

Commit Message

Christoph Hellwig Jan. 10, 2024, 5:45 p.m. UTC 
Call _supports_xfs_scrub so that the test is _notrun on kernels
without online scrub support.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 tests/xfs/262 | 3 +++
 1 file changed, 3 insertions(+)

Comments

Darrick J. Wong Jan. 10, 2024, 5:49 p.m. UTC | #1 
On Wed, Jan 10, 2024 at 06:45:44PM +0100, Christoph Hellwig wrote:
> Call _supports_xfs_scrub so that the test is _notrun on kernels
> without online scrub support.
> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  tests/xfs/262 | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/tests/xfs/262 b/tests/xfs/262
> index b28a6c88b..6df3c79f3 100755
> --- a/tests/xfs/262
> +++ b/tests/xfs/262
> @@ -29,6 +29,9 @@ _require_xfs_io_error_injection "force_repair"
>  echo "Format and populate"
>  _scratch_mkfs > "$seqres.full" 2>&1
>  _scratch_mount
> +
> +_supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || _notrun "Scrub not supported"

Can you refactor this into a common _scratch_require_xfs_scrub helper
for xfs/556 and xfs/716?

The patch itself looks sound.

--D

> +
>  cp $XFS_SCRUB_PROG $SCRATCH_MNT/xfs_scrub
>  $LDD_PROG $XFS_SCRUB_PROG | sed -e '/\//!d;/linux-gate/d;/=>/ {s/.*=>[[:blank:]]*\([^[:blank:]]*\).*/\1/};s/[[:blank:]]*\([^[:blank:]]*\) (.*)/\1/' | while read lib; do
>  	cp $lib $SCRATCH_MNT/
> -- 
> 2.39.2
> 
>
Christoph Hellwig Jan. 10, 2024, 5:52 p.m. UTC | #2 
On Wed, Jan 10, 2024 at 09:49:33AM -0800, Darrick J. Wong wrote:
> > +_supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || _notrun "Scrub not supported"
> 
> Can you refactor this into a common _scratch_require_xfs_scrub helper
> for xfs/556 and xfs/716?

Sure, I'll look into that.
diff mbox series

Patch

diff --git a/tests/xfs/262 b/tests/xfs/262
index b28a6c88b..6df3c79f3 100755
--- a/tests/xfs/262
+++ b/tests/xfs/262
@@ -29,6 +29,9 @@  _require_xfs_io_error_injection "force_repair"
 echo "Format and populate"
 _scratch_mkfs > "$seqres.full" 2>&1
 _scratch_mount
+
+_supports_xfs_scrub $SCRATCH_MNT $SCRATCH_DEV || _notrun "Scrub not supported"
+
 cp $XFS_SCRUB_PROG $SCRATCH_MNT/xfs_scrub
 $LDD_PROG $XFS_SCRUB_PROG | sed -e '/\//!d;/linux-gate/d;/=>/ {s/.*=>[[:blank:]]*\([^[:blank:]]*\).*/\1/};s/[[:blank:]]*\([^[:blank:]]*\) (.*)/\1/' | while read lib; do
 	cp $lib $SCRATCH_MNT/