From: Theodore Ts'o <tytso@mit.edu>
Date: Mon, 20 Jan 2025 17:01:09 +0000 (-0500)
Subject: xfs/032: fix test failure on kernels which don't support bs > ps
X-Git-Tag: v2025.02.02~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6bf32d1a46d4f01d5e45032369a44693d7793fa4;p=xfstests-dev.git

xfs/032: fix test failure on kernels which don't support bs > ps

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>
Reviewed-by: Zorro Lang <zlang@redhat.com>
Reviewed-by: "Darrick J. Wong" <djwong@kernel.org>
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/tests/xfs/032 b/tests/xfs/032
index 41a9134d..675881d5 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