From: Christoph Hellwig <hch@lst.de>
Date: Tue, 28 Jan 2025 07:13:00 +0000 (+0100)
Subject: replace _supported_fs with _exclude_fs
X-Git-Tag: v2025.02.02~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9d6ea111e5b992ee725206c66bb663a2a05d92f5;p=xfstests-dev.git

replace _supported_fs with _exclude_fs

Tests don't require a list of supported file systems, as that is deducted
from the test directory name.  Instead we exclude specific file systems
from a few common tests, and specify which of ext2 and ext3 should
actually also be tested after oddly multiplexing them into the ext4
directory full of tests only working for ext4.

Replace _supported_fs with a new _exclude_fs that takes only a single
file systems as the argument, making it easier to explain why the file
system is not supported for the common test.  For ext4 this increases
the existing mess even further, but the maintainers have a plan to
move it to feature checks instead that are hopefully easier to
understand.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Darrick J. Wong <djwong@kernel.org> # common and tests/generic
Acked-by: Darrick J. Wong <djwong@kernel.org> # tests/ext4
Signed-off-by: Zorro Lang <zlang@kernel.org>
---

diff --git a/common/rc b/common/rc
index 2b71cd7c..4658e3b8 100644
--- a/common/rc
+++ b/common/rc
@@ -1769,30 +1769,16 @@ _fail()
     exit 1
 }
 
-# tests whether $FSTYP is one of the supported filesystems for a test
 #
-_check_supported_fs()
-{
-	local res=1
-	local f
-
-	for f; do
-		# ^FS means black listed fs
-		if [ "$f" = "^$FSTYP" ]; then
-			return 1
-		elif [ "$f" = "generic" ] || [[ "$f" == "^"* ]]; then
-			# ^FS implies "generic ^FS"
-			res=0
-		elif [ "$f" = "$FSTYP" ]; then
-			return 0
-		fi
-	done
-	return $res
-}
-
-_supported_fs()
+# Tests whether $FSTYP should be exclude from this test.
+#
+# In general this should be avoided in favor of feature tests, and when this
+# helper has to be used, it should include a comment on why a specific file
+# system is excluded.
+#
+_exclude_fs()
 {
-	_check_supported_fs $* || \
+	[ "$1" = "$FSTYP" ] && \
 		_notrun "not suitable for this filesystem type: $FSTYP"
 }
 
diff --git a/tests/ext4/001 b/tests/ext4/001
index 4575cf69..1990746a 100755
--- a/tests/ext4/001
+++ b/tests/ext4/001
@@ -14,7 +14,9 @@ _begin_fstest auto prealloc quick zero fiemap
 . ./common/filter
 . ./common/punch
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fzero"
 _require_test
diff --git a/tests/ext4/002 b/tests/ext4/002
index 9c6eb5a0..6c1e1d92 100755
--- a/tests/ext4/002
+++ b/tests/ext4/002
@@ -29,7 +29,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4 ext3
+_exclude_fs ext2
 
 _require_scratch_nocheck
 _require_scratch_shutdown
diff --git a/tests/ext4/003 b/tests/ext4/003
index e2b588d8..e752a769 100755
--- a/tests/ext4/003
+++ b/tests/ext4/003
@@ -20,7 +20,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_scratch_ext4_feature "bigalloc"
diff --git a/tests/ext4/004 b/tests/ext4/004
index ab2f838e..4e6c4a75 100755
--- a/tests/ext4/004
+++ b/tests/ext4/004
@@ -43,7 +43,8 @@ workout()
 	rm -rf restoresymtable
 }
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_test
 _require_scratch
diff --git a/tests/ext4/005 b/tests/ext4/005
index a271fbbf..b581ac1c 100755
--- a/tests/ext4/005
+++ b/tests/ext4/005
@@ -17,7 +17,9 @@ _begin_fstest auto quick metadata ioctl rw
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_command "$CHATTR_PROG" chattr
 
diff --git a/tests/ext4/006 b/tests/ext4/006
index d7862073..2ece22a4 100755
--- a/tests/ext4/006
+++ b/tests/ext4/006
@@ -28,7 +28,8 @@ if [ ! -x "$(type -P e2fuzz)" ]; then
 	_notrun "Couldn't find e2fuzz"
 fi
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_attrs
diff --git a/tests/ext4/007 b/tests/ext4/007
index deedbd9e..39c9427c 100755
--- a/tests/ext4/007
+++ b/tests/ext4/007
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/008 b/tests/ext4/008
index b4b20ac1..1ca6d90e 100755
--- a/tests/ext4/008
+++ b/tests/ext4/008
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/009 b/tests/ext4/009
index 06a42fd7..71e59f90 100755
--- a/tests/ext4/009
+++ b/tests/ext4/009
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_xfs_io_command "falloc"
 _require_scratch
diff --git a/tests/ext4/010 b/tests/ext4/010
index 1139c79e..dec08a62 100755
--- a/tests/ext4/010
+++ b/tests/ext4/010
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_dumpe2fs
diff --git a/tests/ext4/011 b/tests/ext4/011
index cae4fb6b..e135ae4c 100755
--- a/tests/ext4/011
+++ b/tests/ext4/011
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/012 b/tests/ext4/012
index f7f2b0fb..9a420bd3 100755
--- a/tests/ext4/012
+++ b/tests/ext4/012
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/013 b/tests/ext4/013
index 7d2a9154..343a8e65 100755
--- a/tests/ext4/013
+++ b/tests/ext4/013
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/014 b/tests/ext4/014
index ffed795a..870f7ef9 100755
--- a/tests/ext4/014
+++ b/tests/ext4/014
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/015 b/tests/ext4/015
index 81feda5c..08e66958 100755
--- a/tests/ext4/015
+++ b/tests/ext4/015
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "fpunch"
diff --git a/tests/ext4/016 b/tests/ext4/016
index b7db4cfd..925f39d1 100755
--- a/tests/ext4/016
+++ b/tests/ext4/016
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/017 b/tests/ext4/017
index fc867442..f081900a 100755
--- a/tests/ext4/017
+++ b/tests/ext4/017
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/018 b/tests/ext4/018
index f7377f05..5999837a 100755
--- a/tests/ext4/018
+++ b/tests/ext4/018
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/019 b/tests/ext4/019
index 987972a8..dc824396 100755
--- a/tests/ext4/019
+++ b/tests/ext4/019
@@ -21,7 +21,8 @@ _cleanup()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 test -n "${FORCE_FUZZ}" || _require_scratch_ext4_crc
diff --git a/tests/ext4/020 b/tests/ext4/020
index a2fb60fa..c2a188e4 100755
--- a/tests/ext4/020
+++ b/tests/ext4/020
@@ -17,7 +17,9 @@ _begin_fstest auto quick ioctl rw defrag
 . ./common/filter
 . ./common/defrag
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 
diff --git a/tests/ext4/021 b/tests/ext4/021
index d69dc584..337470e0 100755
--- a/tests/ext4/021
+++ b/tests/ext4/021
@@ -12,7 +12,9 @@ _begin_fstest auto quick
 
 # Import common functions.
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_dumpe2fs
 
diff --git a/tests/ext4/022 b/tests/ext4/022
index 6b74ff89..eb04cc9d 100755
--- a/tests/ext4/022
+++ b/tests/ext4/022
@@ -18,7 +18,9 @@ do_setfattr()
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_dumpe2fs
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/023 b/tests/ext4/023
index b5217da3..335a4bff 100755
--- a/tests/ext4/023
+++ b/tests/ext4/023
@@ -18,7 +18,9 @@ _register_cleanup "_cleanup" BUS
 . ./common/populate
 . ./common/fuzzy
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 
 echo "Format and populate"
diff --git a/tests/ext4/024 b/tests/ext4/024
index e58cb991..f3c028ad 100755
--- a/tests/ext4/024
+++ b/tests/ext4/024
@@ -13,7 +13,9 @@ _begin_fstest auto quick encrypt dangerous
 # get standard environment and checks
 . ./common/encrypt
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_encryption
 _require_command "$KEYCTL_PROG" keyctl
 
diff --git a/tests/ext4/025 b/tests/ext4/025
index ce3a3d21..640285a2 100755
--- a/tests/ext4/025
+++ b/tests/ext4/025
@@ -13,7 +13,9 @@ _begin_fstest auto quick fuzzers dangerous
 # get standard environment and checks
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_nocheck
 _require_command "$DEBUGFS_PROG" debugfs
 _require_scratch_ext4_feature "bigalloc,meta_bg,^resize_inode"
diff --git a/tests/ext4/026 b/tests/ext4/026
index 5bb2add2..f29ff5a9 100755
--- a/tests/ext4/026
+++ b/tests/ext4/026
@@ -16,7 +16,9 @@ _begin_fstest auto quick attr
 . ./common/filter
 . ./common/attr
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_attrs
 _require_scratch_ext4_feature "ea_inode"
diff --git a/tests/ext4/027 b/tests/ext4/027
index 93de00f2..8f89062a 100755
--- a/tests/ext4/027
+++ b/tests/ext4/027
@@ -19,7 +19,9 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_xfs_io_command "fsmap"
 
diff --git a/tests/ext4/028 b/tests/ext4/028
index 30f3c448..1b885509 100755
--- a/tests/ext4/028
+++ b/tests/ext4/028
@@ -20,7 +20,9 @@ _cleanup()
 . ./common/filter
 . ./common/populate
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_populate_commands
 _require_xfs_io_command "fsmap"
diff --git a/tests/ext4/029 b/tests/ext4/029
index 8a6969d2..1915aaa6 100755
--- a/tests/ext4/029
+++ b/tests/ext4/029
@@ -19,7 +19,9 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_logdev
 _require_scratch
 _require_xfs_io_command "fsmap"
diff --git a/tests/ext4/030 b/tests/ext4/030
index 80f34ccf..5eec9d35 100755
--- a/tests/ext4/030
+++ b/tests/ext4/030
@@ -15,7 +15,9 @@ _begin_fstest auto quick dax
 . ./common/filter
 
 # Modify as appropriate.
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_journal_corruption"
 _require_command "$CHATTR_PROG" chattr
diff --git a/tests/ext4/031 b/tests/ext4/031
index b583f825..330804d3 100755
--- a/tests/ext4/031
+++ b/tests/ext4/031
@@ -19,7 +19,9 @@ SAVE_MOUNT_OPTIONS="$MOUNT_OPTIONS"
 MOUNT_OPTIONS=""
 
 # Modify as appropriate.
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_dax_mountopt "dax"
 _require_test_program "t_ext4_dax_inline_corruption"
 _require_scratch_ext4_feature "inline_data"
diff --git a/tests/ext4/032 b/tests/ext4/032
index 238ab178..690fcf06 100755
--- a/tests/ext4/032
+++ b/tests/ext4/032
@@ -83,7 +83,8 @@ _cleanup()
 
 # get standard environment and checks
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_loop
 _require_scratch
diff --git a/tests/ext4/033 b/tests/ext4/033
index 53f7106e..3827ab5c 100755
--- a/tests/ext4/033
+++ b/tests/ext4/033
@@ -24,7 +24,9 @@ _cleanup()
 . ./common/filter
 . ./common/dmhugedisk
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_nocheck
 _require_dmhugedisk
 _require_dumpe2fs
diff --git a/tests/ext4/034 b/tests/ext4/034
index cdd2e553..c4ae8075 100755
--- a/tests/ext4/034
+++ b/tests/ext4/034
@@ -19,7 +19,8 @@ _begin_fstest auto quick quota fiemap prealloc
 
 
 # Modify as appropriate.
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_scratch
 _require_quota
 _require_nobody
diff --git a/tests/ext4/035 b/tests/ext4/035
index cf221c5a..fe2a7468 100755
--- a/tests/ext4/035
+++ b/tests/ext4/035
@@ -19,7 +19,8 @@ _begin_fstest auto quick resize
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_scratch
 _exclude_scratch_mount_option dax
 _require_command "$RESIZE2FS_PROG" resize2fs
diff --git a/tests/ext4/036 b/tests/ext4/036
index 045fe82f..4a1471fd 100755
--- a/tests/ext4/036
+++ b/tests/ext4/036
@@ -15,7 +15,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext3 ext4
+_exclude_fs ext2
+
 _require_scratch
 
 echo "Silence is golden"
diff --git a/tests/ext4/037 b/tests/ext4/037
index ac309d67..dea02a79 100755
--- a/tests/ext4/037
+++ b/tests/ext4/037
@@ -15,7 +15,7 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext3 ext4
+_exclude_fs ext2
 
 # nofsck as we modify sb via debugfs
 _require_scratch_nocheck
diff --git a/tests/ext4/038 b/tests/ext4/038
index b594bd9c..07b090b1 100755
--- a/tests/ext4/038
+++ b/tests/ext4/038
@@ -10,9 +10,8 @@
 . ./common/preamble
 _begin_fstest auto quick
 
-# Import common functions.
+_exclude_fs ext2
 
-_supported_fs ext3 ext4
 _require_scratch
 _require_command "$DEBUGFS_PROG" debugfs
 
diff --git a/tests/ext4/039 b/tests/ext4/039
index 2830740e..2e99c8ff 100755
--- a/tests/ext4/039
+++ b/tests/ext4/039
@@ -56,7 +56,8 @@ chattr_opt: $chattr_opt" >>$seqres.full
 	done
 }
 
-_supported_fs ext3 ext4
+_exclude_fs ext2
+
 _require_scratch
 _exclude_scratch_mount_option dax
 
diff --git a/tests/ext4/040 b/tests/ext4/040
index 5760058a..f22c655b 100755
--- a/tests/ext4/040
+++ b/tests/ext4/040
@@ -21,7 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext2 ext3 ext4
 _require_scratch_nocheck
 _disable_dmesg_check
 _require_command "$DEBUGFS_PROG"
diff --git a/tests/ext4/041 b/tests/ext4/041
index 76513db3..3df1b9db 100755
--- a/tests/ext4/041
+++ b/tests/ext4/041
@@ -21,7 +21,6 @@ PIDS=""
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext2 ext3 ext4
 _require_scratch_nocheck
 _disable_dmesg_check
 _require_command "$DEBUGFS_PROG"
diff --git a/tests/ext4/042 b/tests/ext4/042
index 0d97f6de..61fe948f 100755
--- a/tests/ext4/042
+++ b/tests/ext4/042
@@ -12,9 +12,6 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-
-# Modify as appropriate.
-_supported_fs ext2 ext3 ext4
 _require_scratch
 
 _scratch_mkfs >> $seqres.full 2>&1
diff --git a/tests/ext4/043 b/tests/ext4/043
index 0bbbb42a..8d124ba3 100755
--- a/tests/ext4/043
+++ b/tests/ext4/043
@@ -12,7 +12,7 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext3 ext4
+_exclude_fs ext2
 
 _require_scratch
 _require_test_program "t_get_file_time"
diff --git a/tests/ext4/044 b/tests/ext4/044
index 53006514..cd52f0d7 100755
--- a/tests/ext4/044
+++ b/tests/ext4/044
@@ -12,7 +12,9 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_test_program "t_get_file_time"
 _require_metadata_journaling
diff --git a/tests/ext4/045 b/tests/ext4/045
index 587bedec..15b2541e 100755
--- a/tests/ext4/045
+++ b/tests/ext4/045
@@ -16,7 +16,8 @@ LONG_DIR=2
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_scratch_ext4_feature large_dir
diff --git a/tests/ext4/046 b/tests/ext4/046
index 5c2100ce..60d33550 100755
--- a/tests/ext4/046
+++ b/tests/ext4/046
@@ -16,7 +16,8 @@ _begin_fstest auto prealloc quick
 . ./common/filter
 
 _require_check_dmesg
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_scratch
 _require_xfs_io_command "falloc"
 _require_scratch_size $((6 * 1024 * 1024)) #kB
diff --git a/tests/ext4/047 b/tests/ext4/047
index f67b615a..b7df1ede 100755
--- a/tests/ext4/047
+++ b/tests/ext4/047
@@ -13,7 +13,9 @@ _begin_fstest auto quick dax
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_dax_mountopt "dax=always"
 _require_dax_iflag
 _require_scratch_ext4_feature "inline_data"
diff --git a/tests/ext4/048 b/tests/ext4/048
index 99a2c7b8..2031c8c8 100755
--- a/tests/ext4/048
+++ b/tests/ext4/048
@@ -13,7 +13,8 @@ _begin_fstest auto quick dir
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/049 b/tests/ext4/049
index 5b24e632..075408e0 100755
--- a/tests/ext4/049
+++ b/tests/ext4/049
@@ -13,7 +13,8 @@ _begin_fstest auto quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_scratch
 
 sdev=$(_short_dev ${SCRATCH_DEV})
diff --git a/tests/ext4/050 b/tests/ext4/050
index 6ba0038e..99e82489 100755
--- a/tests/ext4/050
+++ b/tests/ext4/050
@@ -13,7 +13,8 @@ _begin_fstest auto ioctl quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/051 b/tests/ext4/051
index a1e35fa3..728ad19b 100755
--- a/tests/ext4/051
+++ b/tests/ext4/051
@@ -12,7 +12,8 @@
 . ./common/preamble
 _begin_fstest auto rw quick
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_scratch
 _require_scratch_shutdown
 _require_command "$TUNE2FS_PROG" tune2fs
diff --git a/tests/ext4/052 b/tests/ext4/052
index edcdc025..0df8a651 100755
--- a/tests/ext4/052
+++ b/tests/ext4/052
@@ -29,7 +29,8 @@ _cleanup()
 
 
 # Modify as appropriate.
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 _require_test
 _require_loop
 _require_test_program "dirstress"
diff --git a/tests/ext4/053 b/tests/ext4/053
index 4f20d217..5922ed57 100755
--- a/tests/ext4/053
+++ b/tests/ext4/053
@@ -39,7 +39,6 @@ echo "Silence is golden."
 SIZE=$((1024 * 1024))	# 1GB in KB
 LOGSIZE=$((10 *1024))	# 10MB in KB
 
-_supported_fs ext2 ext3 ext4
 _require_scratch_size $SIZE
 _require_quota
 _require_loop
diff --git a/tests/ext4/054 b/tests/ext4/054
index 0dbe8364..458eed6a 100755
--- a/tests/ext4/054
+++ b/tests/ext4/054
@@ -17,7 +17,9 @@ _begin_fstest auto quick dangerous_fuzzers prealloc punch
 # Import common functions
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_nocheck
 _require_xfs_io_command "falloc"
 _require_xfs_io_command "pwrite"
diff --git a/tests/ext4/055 b/tests/ext4/055
index e1815c23..3117bf15 100755
--- a/tests/ext4/055
+++ b/tests/ext4/055
@@ -16,8 +16,10 @@
 . ./common/preamble
 _begin_fstest auto quota
 
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_nocheck
-_supported_fs ext4
 _require_user fsgqa
 _require_user fsgqa2
 _require_command "$DEBUGFS_PROG" debugfs
diff --git a/tests/ext4/056 b/tests/ext4/056
index 8a290b11..fb5bbe93 100755
--- a/tests/ext4/056
+++ b/tests/ext4/056
@@ -26,7 +26,9 @@ ONLINE_RESIZE_BLOCK_LIMIT=$((256*1024*1024))
 
 STOP_ITER=255   # Arbitrary return code
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch_size $(($RESIZED_FS_SIZE/1024))
 _require_test_program "ext4_resize"
 
diff --git a/tests/ext4/057 b/tests/ext4/057
index 73cdf941..2be46223 100755
--- a/tests/ext4/057
+++ b/tests/ext4/057
@@ -11,7 +11,9 @@ _begin_fstest auto ioctl
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_test_program uuid_ioctl
 _require_command $UUIDGEN_PROG uuidgen
diff --git a/tests/ext4/058 b/tests/ext4/058
index f8536496..9a2c3aa5 100755
--- a/tests/ext4/058
+++ b/tests/ext4/058
@@ -13,7 +13,9 @@
 . ./common/preamble
 _begin_fstest auto quick
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _fixed_by_kernel_commit a08f789d2ab5 \
 	"ext4: fix bug_on ext4_mb_use_inode_pa"
 _require_scratch
diff --git a/tests/ext4/059 b/tests/ext4/059
index 50e788f0..7ea7ff92 100755
--- a/tests/ext4/059
+++ b/tests/ext4/059
@@ -11,7 +11,9 @@
 . ./common/preamble
 _begin_fstest auto resize quick
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _fixed_by_kernel_commit b55c3cd102a6 \
 	"ext4: add reserved GDT blocks check"
 
diff --git a/tests/ext4/060 b/tests/ext4/060
index 38d1c8f7..b8cc542f 100755
--- a/tests/ext4/060
+++ b/tests/ext4/060
@@ -14,7 +14,9 @@
 . ./common/preamble
 _begin_fstest auto resize quick
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _fixed_by_kernel_commit a6b3bfe176e8 \
 	"ext4: fix corruption during on-line resize"
 
diff --git a/tests/ext4/271 b/tests/ext4/271
index 6d60f40d..55353847 100755
--- a/tests/ext4/271
+++ b/tests/ext4/271
@@ -12,7 +12,9 @@ _begin_fstest auto rw quick
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 # this test needs no journal to be loaded, skip on journal related mount
 # options, otherwise mount would fail with "-o noload" mount option
diff --git a/tests/ext4/301 b/tests/ext4/301
index dd0c7d48..abf47d4b 100755
--- a/tests/ext4/301
+++ b/tests/ext4/301
@@ -15,7 +15,9 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 _require_odirect
diff --git a/tests/ext4/302 b/tests/ext4/302
index d73cf9bf..87820184 100755
--- a/tests/ext4/302
+++ b/tests/ext4/302
@@ -16,7 +16,9 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 _require_odirect
diff --git a/tests/ext4/303 b/tests/ext4/303
index d9be4567..2381f047 100755
--- a/tests/ext4/303
+++ b/tests/ext4/303
@@ -16,7 +16,9 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 _require_odirect
diff --git a/tests/ext4/304 b/tests/ext4/304
index 208b8a2a..53b522ee 100755
--- a/tests/ext4/304
+++ b/tests/ext4/304
@@ -17,7 +17,9 @@ fio_config=$tmp.fio
 . ./common/filter
 . ./common/defrag
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 _require_odirect
diff --git a/tests/ext4/305 b/tests/ext4/305
index acada44b..35dae557 100755
--- a/tests/ext4/305
+++ b/tests/ext4/305
@@ -22,7 +22,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 
diff --git a/tests/ext4/306 b/tests/ext4/306
index b5147caf..b0e08f65 100755
--- a/tests/ext4/306
+++ b/tests/ext4/306
@@ -22,7 +22,8 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
 
 _require_scratch
 _require_command "$RESIZE2FS_PROG" resize2fs
diff --git a/tests/ext4/307 b/tests/ext4/307
index 8361f043..1f0e42ca 100755
--- a/tests/ext4/307
+++ b/tests/ext4/307
@@ -34,7 +34,9 @@ _workout()
 	run_check md5sum -c $out.md5sum
 }
 
-_supported_fs ext4
+_exclude_fs ext2
+_exclude_fs ext3
+
 _require_scratch
 _require_defrag
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/187 b/tests/generic/187
index 2a06aff3..536ce9fa 100755
--- a/tests/generic/187
+++ b/tests/generic/187
@@ -28,10 +28,12 @@ _cleanup()
 . ./common/filter
 . ./common/reflink
 
+# btrfs can't fragment free space.
+_exclude_fs btrfs
+
+# This test is unreliable on NFS, as it depends on the exported filesystem.
+_exclude_fs nfs
 
-# btrfs can't fragment free space. This test is unreliable on NFS, as it
-# depends on the exported filesystem.
-_supported_fs ^btrfs ^nfs
 _require_scratch_reflink
 _require_cp_reflink
 _require_xfs_io_command "falloc"
diff --git a/tests/generic/294 b/tests/generic/294
index 54b89a26..b0745911 100755
--- a/tests/generic/294
+++ b/tests/generic/294
@@ -16,7 +16,7 @@ _begin_fstest auto quick
 
 # NFS will optimize away the on-the-wire lookup before attempting to
 # create a new file (since that means an extra round trip).
-_supported_fs ^nfs
+_exclude_fs nfs
 
 _require_scratch
 _require_symlinks
diff --git a/tests/generic/357 b/tests/generic/357
index 8db31f8b..51c6d5ef 100755
--- a/tests/generic/357
+++ b/tests/generic/357
@@ -26,7 +26,7 @@ _cleanup()
 
 # For NFS, a reflink is just a CLONE operation, and after that
 # point it's dealt with by the server.
-_supported_fs ^nfs
+_exclude_fs nfs
 
 _require_scratch_swapfile
 _require_scratch_reflink
diff --git a/tests/generic/362 b/tests/generic/362
index 2396ec7d..3a1993e8 100755
--- a/tests/generic/362
+++ b/tests/generic/362
@@ -11,7 +11,8 @@
 _begin_fstest auto quick
 
 # NFS forbade open with O_APPEND|O_DIRECT
-_supported_fs ^nfs
+_exclude_fs nfs
+
 _require_test
 _require_odirect
 _require_test_program dio-append-buf-fault
diff --git a/tests/generic/370 b/tests/generic/370
index 67af7b6e..8adffd2e 100755
--- a/tests/generic/370
+++ b/tests/generic/370
@@ -28,7 +28,7 @@ _cleanup()
 # https://lore.kernel.org/linux-xfs/CAL3q7H7cURmnkJfUUx44HM3q=xKmqHb80eRdisErD_x8rU4+0Q@mail.gmail.com/
 # https://lore.kernel.org/fstests/dca49a16a7aacdab831b8895bdecbbb52c0e609c.1733928765.git.fdmanana@suse.com/
 #
-_supported_fs ^xfs
+_exclude_fs xfs
 
 _require_scratch_swapfile
 _require_scratch_reflink
diff --git a/tests/generic/465 b/tests/generic/465
index f8c4ea96..5b49040e 100755
--- a/tests/generic/465
+++ b/tests/generic/465
@@ -20,7 +20,7 @@ _cleanup()
 # Import common functions.
 . ./common/filter
 
-_supported_fs ^nfs
+_exclude_fs nfs
 
 _require_aiodio aio-dio-append-write-read-race
 _require_test_program "feature"
diff --git a/tests/generic/500 b/tests/generic/500
index ba6e902e..c5492a09 100755
--- a/tests/generic/500
+++ b/tests/generic/500
@@ -41,7 +41,7 @@ _require_dm_target thin-pool
 # and since we've filled the thinp device it'll return EIO, which will make
 # btrfs flip read only, making it fail this test when it just won't work right
 # for us in the first place.
-_supported_fs ^btrfs
+_exclude_fs btrfs
 
 # Require underlying device support discard
 _scratch_mkfs >>$seqres.full 2>&1
diff --git a/tests/generic/631 b/tests/generic/631
index 642d4786..8e2cf9c6 100755
--- a/tests/generic/631
+++ b/tests/generic/631
@@ -37,8 +37,10 @@ _cleanup()
 
 _require_scratch
 _require_attrs trusted
-_supported_fs ^overlay
+
+_exclude_fs overlay
 _require_extra_fs overlay
+
 _fixed_by_kernel_commit 6da1b4b1ab36 \
 	"xfs: fix an ABBA deadlock in xfs_rename"
 
diff --git a/tests/generic/679 b/tests/generic/679
index 4c74101c..741ddf21 100755
--- a/tests/generic/679
+++ b/tests/generic/679
@@ -23,7 +23,7 @@ _require_xfs_io_command "fiemap"
 #
 #   https://lore.kernel.org/linux-btrfs/20220315164011.GF8241@magnolia/
 #
-_supported_fs ^xfs
+_exclude_fs xfs
 
 rm -f $seqres.full
 
diff --git a/tests/generic/699 b/tests/generic/699
index 3079a861..620a40aa 100755
--- a/tests/generic/699
+++ b/tests/generic/699
@@ -21,8 +21,9 @@ _cleanup()
 	rm -r -f $tmp.*
 }
 
-_supported_fs ^overlay
+_exclude_fs overlay
 _require_extra_fs overlay
+
 _require_scratch
 _require_chown
 _require_idmapped_mounts
diff --git a/tests/generic/732 b/tests/generic/732
index e907a009..83caa0bc 100755
--- a/tests/generic/732
+++ b/tests/generic/732
@@ -24,7 +24,9 @@ _cleanup()
 # This case give a assumption that the same mount options for
 # different mount point will share the same superblock, which won't
 # sucess for the follow fs.
-_supported_fs ^nfs ^overlay ^tmpfs
+_exclude_fs nfs
+_exclude_fs overlay
+_exclude_fs tmpfs
 
 _require_test
 _require_scratch
diff --git a/tests/generic/740 b/tests/generic/740
index 903e891d..10817521 100755
--- a/tests/generic/740
+++ b/tests/generic/740
@@ -14,7 +14,12 @@ _begin_fstest mkfs auto quick
 
 # a bunch of file systems don't support foreign fs detection
 # ext* do support it, but disable the feature when called non-interactively
-_supported_fs ^ext2 ^ext3 ^ext4 ^jfs ^ocfs2 ^udf
+_exclude_fs ext2
+_exclude_fs ext3
+_exclude_fs ext4
+_exclude_fs jfs
+_exclude_fs ocfs2
+_exclude_fs udf
 
 _require_block_device "${SCRATCH_DEV}"
 # not all the FS support zoned block device