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 2b71cd7ca9a7f251eb7e3ff75685799d3fbcf15c..4658e3b8be747f4f0e19f950f76ac6b3ecfec8d0 100644 (file)
--- 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 4575cf6973bb24b5d34813047dd8fc6ba71566c9..1990746aa58764598c70aad01e653067dd042685 100755 (executable)
--- 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 9c6eb5a0413605333a0305513b225ee8f4a89f75..6c1e1d926973c3e7f4fad6de46e545fbde6f6173 100755 (executable)
--- 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 e2b588d888499f95ddf3d0d5ea17f7660445ff59..e752a769603f78f6577721cb79ecc50d7c0943ee 100755 (executable)
--- 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 ab2f838e9facc65885d4a7fc1ce2164c5297df5c..4e6c4a75f60175e73c91809a22a5f05b4f1a921f 100755 (executable)
--- 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 a271fbbf641af389888fbc5f8248eecee0bfec9f..b581ac1cacb9e03dbe5636381725c7aa732537b9 100755 (executable)
--- 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 d7862073114872b5159b809f63077f48930e98ab..2ece22a4bd1ed8f5d153dd849529a1c317dce760 100755 (executable)
--- 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 deedbd9e8fb3d8bab9a3b370dc9a32a24dd50367..39c9427c525798a85e4da611d0d709b50440dbe4 100755 (executable)
--- 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 b4b20ac10d6d2a470bfbd1d7d34df59dcaed83b2..1ca6d90e0c3d412da6b932b47beed3353cc74466 100755 (executable)
--- 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 06a42fd77ffa0c34f265f1d4b8c10a4b1aa19de0..71e59f90e4b8443766c22f719c9a38263690fd9d 100755 (executable)
--- 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 1139c79e80d5382a2d3c08e4de10e9bd78c11ca5..dec08a62cdf020b140aaa001ee2ff29e26da3a89 100755 (executable)
--- 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 cae4fb6b84768b87b59ded7e253cebe80f334675..e135ae4cefac73f4da9205734ee3fa8572d59114 100755 (executable)
--- 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 f7f2b0fb4557623ab9a6fe39d44a6b5939098ff0..9a420bd3c6962bd8c08058f2d0d1ea43b7b73b06 100755 (executable)
--- 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 7d2a9154a66936057d68f36d357fd3cab5b86157..343a8e65cfce368d2f066cab095715890855e628 100755 (executable)
--- 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 ffed795ad4e93cceb2ef8a42792d3f75490f2bbe..870f7ef911a26217f5412b966f2676a3fdfcc741 100755 (executable)
--- 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 81feda5c9423fb34762a50b05550ff981de17841..08e669584c6bfbe9109cba21416d9a32b2f1e0cc 100755 (executable)
--- 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 b7db4cfda649eff6048d05a12cfe85c0e7672055..925f39d15ad2bb266f2c1cc6c52ec8283e8b1570 100755 (executable)
--- 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 fc867442c3da3aab71346066e7535a6050810043..f081900a9a1ed138373b6c3856e5365d506c73eb 100755 (executable)
--- 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 f7377f059fb826d1d33a6b476bee92ddb93e67ff..5999837a9db1b67525beed5f3c647c66892426ea 100755 (executable)
--- 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 987972a80a370407547c8dc6504762d987d41edb..dc8243961ee06482ea84f36895890d396d88ec04 100755 (executable)
--- 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 a2fb60fa8cc6729b0bfd3dcd0c511d22e1dda25d..c2a188e4cdaecb8c88fbfb3ea7d9a22ce6212af3 100755 (executable)
--- 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 d69dc584dc584f87b0ee021c2143283f0b32413e..337470e0ca6bea2d04d3617899dca49015f9f1e3 100755 (executable)
--- 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 6b74ff892a35faa7bf998baf452b674819476d01..eb04cc9d900069b762edb11cb4807c8a767b7fa4 100755 (executable)
--- 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 b5217da33f157706a3115d8a69536e201ef065e0..335a4bfff96d4433be14e06e987e53e93890069b 100755 (executable)
--- 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 e58cb9918f25ead137ed24e208204a4b33b8e352..f3c028adda688d528494d6c591d5e54cc395ef48 100755 (executable)
--- 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 ce3a3d21969bca24f51dc7438ce7f0acf91cb9da..640285a25a53bfab385c12d12e970bdb5057bccc 100755 (executable)
--- 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 5bb2add2303656d3d30cba2f573af99116d34669..f29ff5a97688c87d9b85f13332c22da1dc0535c8 100755 (executable)
--- 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 93de00f29481c7a5ab58a5e33c9394a905efafd8..8f89062afd0add1ba80b51c0d984489f19162127 100755 (executable)
--- 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 30f3c4480c7cbfcc1acf442e8113ea2e709dc53d..1b8855098f82f4e5bb8a110bff2e6ed729c1eca2 100755 (executable)
--- 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 8a6969d2aaefe2241a4682ce0f12e29e39587c98..1915aaa67a74eb23e0d14980baca0cc82fe75cea 100755 (executable)
--- 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 80f34ccf3e493d0672021f9f8ec96e83fbcc6168..5eec9d353a8e36ea5c96a7f2539fed4fc5b5df2d 100755 (executable)
--- 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 b583f825162ff6c44668b5b2d03949e1ef72cc45..330804d3968883deb85d9f829a9e431362a7640a 100755 (executable)
--- 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 238ab178363c1230436c3f66b5054cdd9abbb9f9..690fcf066c116a8c631a404a96d7c65ca6b8d311 100755 (executable)
--- 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 53f7106e2c6ba42e8aa667c6f02cf37fccddb190..3827ab5c52ad0a9cedcd3c719c2c1dcc4e05a414 100755 (executable)
--- 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 cdd2e553f53489b5977075a21b77c22f3f36834c..c4ae807519d6672bb8fc99bca05b3864e746c01d 100755 (executable)
--- 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 cf221c5adb7d93046be96625a33a0ce3fb9b50db..fe2a74680f01d8752031450f061d6549e21fb483 100755 (executable)
--- 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 045fe82ff9562433df3ea3ad21095620c26a03bf..4a1471fd4cb56e6f568a3598a270be9f6f082789 100755 (executable)
--- 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 ac309d67aac5123ac33b95190941dd507fefd2e8..dea02a79927a34a7fe22995c35bdef33f683b358 100755 (executable)
--- 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 b594bd9cb2e2daa24f5d1ad8c3e0663564241d82..07b090b11f131916dd97c22190e4f74d8d272efd 100755 (executable)
--- 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 2830740eb3cf95d998bc7f07479743c6ed3e9f41..2e99c8ff9ffd037bfa059c26c1db3faadf3923d5 100755 (executable)
--- 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 5760058ad7d4332fdc6dea783dda7c918bac3ae0..f22c655b49091c5c1e629b7039a693518d2a5213 100755 (executable)
--- 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 76513db3f88779421947573e29de65d4b2bba92f..3df1b9db803d03a912c55338b0100994f78732e6 100755 (executable)
--- 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 0d97f6de4c2a83b71250f97935a65d06a173fd08..61fe948f2b6173ee2f3cb02c8a4c0f2e6bbd96cc 100755 (executable)
--- 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 0bbbb42ac41d76181ca667b047941ad27d4c1361..8d124ba36f7276a7be21815b1cde3fc94bf9b0e3 100755 (executable)
--- 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 53006514dc728d55b6fa8dd2563f4ccf1fd66981..cd52f0d741e0dc3e92fbb806b86468367ac4a20c 100755 (executable)
--- 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 587bedece4e16789feb660d5b9aa6239d5177e22..15b2541ee342fa4c9998ed94506cb726c78c0b40 100755 (executable)
--- 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 5c2100ce92538193098a2cf8b847417c6faf392e..60d33550e3db599ba500c196d896e8f55544745e 100755 (executable)
--- 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 f67b615ab08251a0e723460f6726b0f9edc75da1..b7df1ede4805ad1b093136e6e6e059c10b288b9c 100755 (executable)
--- 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 99a2c7b8fe4d2a79a98085784f75565c77b535bb..2031c8c8933d69d3385e8b847a711af4fd71c7fb 100755 (executable)
--- 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 5b24e632a73b645339aee46f0768fdce1b5603b6..075408e0b86705ae7b54a6f31536ac2cf47419c1 100755 (executable)
--- 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 6ba0038e71f26f4e09a83be87ccb305ba852d8a6..99e824898e0f5bc298eb556865f38f901981233b 100755 (executable)
--- 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 a1e35fa323d32146d2e4467c56e6aab3c1180fed..728ad19bfcecfc1012dece95e10943cfd975fc2b 100755 (executable)
--- 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 edcdc02515f725a2cf60721ea4df249858c991e1..0df8a651383ec716c8e83f24fd42ddf8006e5e7e 100755 (executable)
--- 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 4f20d217d5fd7a6923faeb32423e664b8daf0ccf..5922ed571d8af56f40171f4e828a68c5e3d28f4d 100755 (executable)
--- 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 0dbe83640072c99caa30e060bb1458f4ac1e19db..458eed6a7072534264531e5789ed77cc3b74016a 100755 (executable)
--- 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 e1815c23727a3f41fab1d1f775c4eacd34557abd..3117bf15f9f07e0799c831a7e3e228f481cb3508 100755 (executable)
--- 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 8a290b11d69772be57524782a0126b41d2d3c1ff..fb5bbe93e972c642244aabc433d254ad8463e12d 100755 (executable)
--- 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 73cdf941a181d7e32bea8ff110af72592f6587b4..2be46223538fba394fbd7a0f8671c4624064b9c0 100755 (executable)
--- 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 f853649644dbc5500e56de2dbc12c779ffd54a8d..9a2c3aa59ba8a9d5e14cbb2fadd316d77b764065 100755 (executable)
--- 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 50e788f0a1693c7dfabc1691d38a7ac85f5c6e0a..7ea7ff92744d1118feba0d3c73b7eae7bc94440d 100755 (executable)
--- 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 38d1c8f7b672c4f5aa211fdb8a5c4dbd3f5cc895..b8cc542fd2425036e008cb6da6a5af053ef526d0 100755 (executable)
--- 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 6d60f40d3d259248bb08361e319cb5df46268677..5535384742ee8b864de975a0b4c965e8b8adc31a 100755 (executable)
--- 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 dd0c7d4837612264698b5fd65a965b80af552fbc..abf47d4b7ecea2b2c1564d7fd1c75d17de95fad2 100755 (executable)
--- 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 d73cf9bf84da9257b1c8bbea3a2ace0c75edfcad..87820184e30f716f8402c815fe30bf0d5345c696 100755 (executable)
--- 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 d9be45674e401ebbefd2208585ff026d711e0924..2381f04770828f6d9c87b6777ed04aaf327d38eb 100755 (executable)
--- 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 208b8a2ac11951c95777a864bec2e0653af27c02..53b522ee85bdcf0b5410dd9792a7736639f246e6 100755 (executable)
--- 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 acada44bc75a30dccc77dbdac0e964af74c84e92..35dae5571b55caa301453b7a07197cf0b4c21d6b 100755 (executable)
--- 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 b5147caf547ec59a8c42dd693c463ccf13007192..b0e08f65ea243d10cde93100e7bd9cb507c8486a 100755 (executable)
--- 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 8361f04312b256dc758b18e967d939c32dc3933a..1f0e42ca263811d28648ccf71a47bfdaa3cd96ff 100755 (executable)
--- 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 2a06aff35e5838bcede3a984be745d3577da9904..536ce9fa9ab81dfb6a683e6aa382239ec257b439 100755 (executable)
--- 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 54b89a26294fe20f3c6d8b454f65299710c3923a..b074591163714d3cd324dced4a1b0b25329df0ae 100755 (executable)
--- 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 8db31f8b04323fe0271a7bfc2c3d167a5c865a13..51c6d5efd2d72a047d960a37cbde245c72edf497 100755 (executable)
--- 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 2396ec7d3a577322bad90baa0b3e624e5015fe02..3a1993e81d4b28c1c296d06794304d041edf8439 100755 (executable)
--- 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 67af7b6e0925538aee6be3e0cc6807b7e5a82c43..8adffd2e9650a2781fe987eec1472a0c544e1005 100755 (executable)
--- 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 f8c4ea9671a21ca18a73248553da49b85b53ebb4..5b49040e3ad04eaaccb10091d1dafe6671ecd46e 100755 (executable)
--- 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 ba6e902ec96ba6d43687cdf3148ec9933cd850ac..c5492a09246c96eb804133ace64698391b6a52d6 100755 (executable)
--- 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 642d47863987720bb9727bface133f4d18311feb..8e2cf9c63b778c1bcb04e1aa63b11cda77d9e14e 100755 (executable)
--- 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 4c74101c583403f4db84af19d91311f47d9fc59e..741ddf21502f3a60b492a244e2f9719204bb9549 100755 (executable)
--- 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 3079a861df7457c8b486c188fe6d519e63c208de..620a40aa3921e24207bca72e93fed89418ca2e71 100755 (executable)
--- 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 e907a009fe16073c13a895062a2dd3dd8d20ec9c..83caa0bc915c327e9ade96e28bffc4c2379bd771 100755 (executable)
--- 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 903e891db0fd7a83c5b45470e4f8704c37f3279e..10817521cc934227c0fe41e1e6828990c7ce37c9 100755 (executable)
--- 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