xfs: skip various tests on zoned devices

Various tests don't work with underlying zoned devices because either the
device mapper maps don't align to zone boundaries, or in one case the test
creates an ext2 file system that doesn't support zoned devices.

Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/tests/xfs/049 b/tests/xfs/049
index cdcddf76498cf4bafca64224464003c6f09d0805..07feb58c9ad6529f95f6d2cdb05c2ee2ecabf2f2 100755 (executable)
--- a/tests/xfs/049
+++ b/tests/xfs/049
@@ -40,6 +40,8 @@ _require_scratch_nocheck
 _require_no_large_scratch_dev
 _require_loop
 _require_extra_fs ext2
+# this test actually runs ext2 on the scratch device
+_require_non_zoned_device $SCRATCH_DEV
 
 echo "(dev=$SCRATCH_DEV, mount=$SCRATCH_MNT)" >> $seqres.full
 echo "" >> $seqres.full

diff --git a/tests/xfs/311 b/tests/xfs/311
index 8b806fc29eb1e9f0b723ef2df2326e53f13fd4fb..e8fc547cc4b4dfb3073cb547f2f4a379ab54aaa8 100755 (executable)
--- a/tests/xfs/311
+++ b/tests/xfs/311
@@ -30,6 +30,9 @@ _cleanup()
 _require_scratch
 _require_dm_target delay
 
+# The dm-delay map added by this test doesn't work on zoned devices
+_require_non_zoned_device $SCRATCH_DEV
+
 echo "Silence is golden."
 
 _scratch_mkfs_xfs >> $seqres.full 2>&1

diff --git a/tests/xfs/438 b/tests/xfs/438
index 6d1988c8b9b807b5f4f152093642cb9be7dad651..d436b583f9d1bb3bb6c01fa705769029b8c03bb8 100755 (executable)
--- a/tests/xfs/438
+++ b/tests/xfs/438
@@ -96,6 +96,13 @@ _require_user
 _require_xfs_quota
 _require_freeze
 
+#
+# The dm-flakey map added by this test doesn't work on zoned devices
+# because table sizes need to be aligned to the zone size.
+#
+_require_non_zoned_device $SCRATCH_DEV
+_require_non_zoned_device $SCRATCH_RTDEV
+
 echo "Silence is golden"
 
 _scratch_mkfs > $seqres.full 2>&1