[PATCH 07/13] xfs/3{43,32}: adapt tests for rt extent size greater than 1

Darrick J. Wong
2025-02-19T01:05:29Z

From: Darrick J. Wong <djwong@kernel.org>

Both of these tests for the realtime volume can fail when the rt extent
size is larger than a single block.

332 is a read-write functionality test that encodes md5sum in the
output, so we need to skip it if $blksz isn't congruent with the extent
size, because the fcollapse call will fail.

343 is a test of the rmap btree, so the fix here is simpler -- make
$blksz the file allocation unit, and get rid of the md5sum in the
golden output.

Signed-off-by: "Darrick J. Wong" <djwong@kernel.org>
---
tests/xfs/332 | 6 +-----
tests/xfs/332.out | 2 --
tests/xfs/343 | 2 ++
3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/tests/xfs/332 b/tests/xfs/332
index 93c94bcdccf07e..fd91ebab164f34 100755
--- a/tests/xfs/332
+++ b/tests/xfs/332
@@ -26,7 +26,7 @@ rm -f "$seqres.full"
echo "Format and mount"
_scratch_mkfs > "$seqres.full" 2>&1
_scratch_mount
-blksz=65536
+blksz=$(_get_file_block_size $SCRATCH_MNT) # 65536
blocks=16
len=$((blocks * blksz))

@@ -43,10 +43,6 @@ $XFS_IO_PROG -c "fpunch $blksz $blksz" \
-c "fcollapse $((9 * blksz)) $blksz" \
-c "finsert $((10 * blksz)) $blksz" $SCRATCH_MNT/f1 >> $seqres.full

-echo "Check file"
-md5sum $SCRATCH_MNT/f1 | _filter_scratch
-od -tx1 -Ad -c $SCRATCH_MNT/f1 >> $seqres.full
-
echo "Unmount"
_scratch_unmount

diff --git a/tests/xfs/332.out b/tests/xfs/332.out
index 9beff7cc3704c0..3a7ca95b403e77 100644
--- a/tests/xfs/332.out
+++ b/tests/xfs/332.out
@@ -2,8 +2,6 @@ QA output created by 332
Format and mount
Create some files
Manipulate file
-Check file
-e45c5707fcf6817e914ffb6ce37a0ac7 SCRATCH_MNT/f1
Unmount
Try a regular fsmap
Try a bad fsmap
diff --git a/tests/xfs/343 b/tests/xfs/343
index a5834cab123e7d..d5ac96d085ee6b 100755
--- a/tests/xfs/343
+++ b/tests/xfs/343
@@ -29,6 +29,8 @@ blksz=65536
blocks=16
len=$((blocks * blksz))

+_require_congruent_file_oplen $SCRATCH_MNT $blksz
+
echo "Create some files"
$XFS_IO_PROG -f -R -c "falloc 0 $len" -c "pwrite -S 0x68 -b 1048576 0 $len" $SCRATCH_MNT/f1 >> $seqres.full