diff mbox series

[-v2] xfs/32: fix test failure on kernels which don't support bs > ps

Message ID 20250120170109.3770633-1-tytso@mit.edu (mailing list archive)
State New
Headers show
Series [-v2] xfs/32: fix test failure on kernels which don't support bs > ps | expand

Commit Message

Theodore Ts'o Jan. 20, 2025, 5:01 p.m. UTC
When trying to mount a file system with a block size > page size on
kernel which doesn't support this, suppress the error messages from
showing up in the output file lest it cause test failures.

Fixes: 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---
v2:
    As Darrick suggested redirect the output of mount(8) to $seqres.full
    instead of /dev/null

 tests/xfs/032 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Zorro Lang Jan. 21, 2025, 2:35 a.m. UTC | #1
On Mon, Jan 20, 2025 at 12:01:09PM -0500, Theodore Ts'o wrote:
> When trying to mount a file system with a block size > page size on
> kernel which doesn't support this, suppress the error messages from
> showing up in the output file lest it cause test failures.
> 
> Fixes: 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
> Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> ---
> v2:
>     As Darrick suggested redirect the output of mount(8) to $seqres.full
>     instead of /dev/null

Thanks for fixing it.

Reviewed-by: Zorro Lang <zlang@redhat.com>

> 
>  tests/xfs/032 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/xfs/032 b/tests/xfs/032
> index 41a9134d8..675881d5b 100755
> --- a/tests/xfs/032
> +++ b/tests/xfs/032
> @@ -44,7 +44,7 @@ for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
>  		if [ $? -ne 0 ]; then
>  			continue
>  		fi
> -		if ! _try_scratch_mount; then
> +		if ! _try_scratch_mount >> $seqres.full 2>&1 ; then
>  			if [ $BLOCKSIZE -le $PAGESIZE ]; then
>  				_fail "mount $(_scratch_mount_options $*) failed"
>  			fi
> -- 
> 2.45.2
> 
>
Theodore Ts'o Jan. 21, 2025, 3:33 a.m. UTC | #2
On Tue, Jan 21, 2025 at 10:35:36AM +0800, Zorro Lang wrote:
> On Mon, Jan 20, 2025 at 12:01:09PM -0500, Theodore Ts'o wrote:
> > When trying to mount a file system with a block size > page size on
> > kernel which doesn't support this, suppress the error messages from
> > showing up in the output file lest it cause test failures.
> > 
> > Fixes: 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
> > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> > ---
> > v2:
> >     As Darrick suggested redirect the output of mount(8) to $seqres.full
> >     instead of /dev/null
> 
> Thanks for fixing it.
> 
> Reviewed-by: Zorro Lang <zlang@redhat.com>

I just noticed just now that I screwed up the subject line / commit description.

xfs/32: ...

should be:

xfs/032: ...

Sorry for not noticing this earlier!

					- Ted
Zorro Lang Jan. 21, 2025, 5:12 a.m. UTC | #3
On Mon, Jan 20, 2025 at 10:33:56PM -0500, Theodore Ts'o wrote:
> On Tue, Jan 21, 2025 at 10:35:36AM +0800, Zorro Lang wrote:
> > On Mon, Jan 20, 2025 at 12:01:09PM -0500, Theodore Ts'o wrote:
> > > When trying to mount a file system with a block size > page size on
> > > kernel which doesn't support this, suppress the error messages from
> > > showing up in the output file lest it cause test failures.
> > > 
> > > Fixes: 0b66f6efd669 ("xfs/032: try running on blocksize > pagesize filesystems")
> > > Signed-off-by: Theodore Ts'o <tytso@mit.edu>
> > > ---
> > > v2:
> > >     As Darrick suggested redirect the output of mount(8) to $seqres.full
> > >     instead of /dev/null
> > 
> > Thanks for fixing it.
> > 
> > Reviewed-by: Zorro Lang <zlang@redhat.com>
> 
> I just noticed just now that I screwed up the subject line / commit description.
> 
> xfs/32: ...
> 
> should be:
> 
> xfs/032: ...
> 
> Sorry for not noticing this earlier!

Never mind, I've changed that when I merge it :)

> 
> 					- Ted
>
diff mbox series

Patch

diff --git a/tests/xfs/032 b/tests/xfs/032
index 41a9134d8..675881d5b 100755
--- a/tests/xfs/032
+++ b/tests/xfs/032
@@ -44,7 +44,7 @@  for ((; SECTORSIZE <= 65536; SECTORSIZE *= 2)); do
 		if [ $? -ne 0 ]; then
 			continue
 		fi
-		if ! _try_scratch_mount; then
+		if ! _try_scratch_mount >> $seqres.full 2>&1 ; then
 			if [ $BLOCKSIZE -le $PAGESIZE ]; then
 				_fail "mount $(_scratch_mount_options $*) failed"
 			fi