From: Darrick J. Wong <djwong@xxxxxxxxxx> Some tests encode FIEMAP/XFS_IOC_BMAP results in the golden output. Typically these tests cannot handle a filesystem that chooses to allocate extents that are much larger than the filesystem block size (aka XFS rt extents and ext4 bigalloc). Since these tests are /never/ going to pass, disable them when these configurations are detected. Signed-off-by: Darrick J. Wong <djwong@xxxxxxxxxx> --- tests/generic/483 | 4 ++++ tests/generic/677 | 4 ++++ tests/xfs/166 | 4 ++++ tests/xfs/203 | 4 ++++ 4 files changed, 16 insertions(+) diff --git a/tests/generic/483 b/tests/generic/483 index e7120362..39129542 100755 --- a/tests/generic/483 +++ b/tests/generic/483 @@ -35,6 +35,10 @@ _require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey +# The fiemap results in the golden output requires file allocations to align to +# 256K boundaries. +_require_congruent_file_oplen $SCRATCH_MNT 262144 + # Create our test files. $XFS_IO_PROG -f -c "pwrite -S 0xea 0 256K" $SCRATCH_MNT/foo >/dev/null diff --git a/tests/generic/677 b/tests/generic/677 index 39af90a9..4dbfed7d 100755 --- a/tests/generic/677 +++ b/tests/generic/677 @@ -38,6 +38,10 @@ _require_metadata_journaling $SCRATCH_DEV _init_flakey _mount_flakey +# The fiemap results in the golden output requires file allocations to align to +# 1MB boundaries. +_require_congruent_file_oplen $SCRATCH_MNT 1048576 + # Create our test file with many extents. # On btrfs this results in having multiple leaves of metadata full of file # extent items, a condition necessary to trigger the original bug. diff --git a/tests/xfs/166 b/tests/xfs/166 index d45dc5e8..9e082152 100755 --- a/tests/xfs/166 +++ b/tests/xfs/166 @@ -71,6 +71,10 @@ TEST_PROG=$here/src/unwritten_mmap # we need to set the file size to (6 * 2MB == 12MB) to cover all cases. FILE_SIZE=$((12 * 1048576)) +# The xfs_bmap results in the golden output requires file allocations to align +# to 1M boundaries. +_require_congruent_file_oplen $SCRATCH_MNT $FILE_SIZE + rm -f $TEST_FILE $TEST_PROG $FILE_SIZE $TEST_FILE diff --git a/tests/xfs/203 b/tests/xfs/203 index a12ae7c3..9a4a4564 100755 --- a/tests/xfs/203 +++ b/tests/xfs/203 @@ -51,6 +51,10 @@ _require_scratch _scratch_mkfs > /dev/null 2>&1 _scratch_mount > /dev/null 2>&1 +# The xfs_bmap results in the golden output requires file allocations to align +# to 64k boundaries. +_require_congruent_file_oplen $SCRATCH_MNT 65536 + for i in 10 14 15 16 17 28 29 30 31; do rm -f $SCRATCH_MNT/hole_file _write_holes $SCRATCH_MNT/hole_file${i} ${i}