From: Christoph Hellwig <hch@lst.de>
To: Zorro Lang <zlang@kernel.org>
Cc: fstests@vger.kernel.org, "Theodore Ts'o" <tytso@mit.edu>,
linux-ext4@vger.kernel.org
Subject: [PATCH 7/8] generic/746: clean up fs support
Date: Sun, 23 Jun 2024 14:10:36 +0200 [thread overview]
Message-ID: <20240623121103.974270-8-hch@lst.de> (raw)
In-Reply-To: <20240623121103.974270-1-hch@lst.de>
Use a single case statement for fs-specific options and to check if
this test is supported at all.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
tests/generic/746 | 29 +++++++++++++++++++----------
1 file changed, 19 insertions(+), 10 deletions(-)
diff --git a/tests/generic/746 b/tests/generic/746
index 0e6387fe4..b13fd98a1 100755
--- a/tests/generic/746
+++ b/tests/generic/746
@@ -9,23 +9,32 @@
. ./common/preamble
_begin_fstest auto trim fiemap
-_supported_fs ext4 xfs btrfs
+_supported_fs generic
_require_test
_require_loop
_require_fstrim
_require_xfs_io_command "fiemap"
-if [ "$FSTYP" = "btrfs" ]; then
+
+_require_fs_space $TEST_DIR 307200
+fssize=$(_small_fs_size_mb 300) # 200m phys/virt size
+
+case "$FSTYP" in
+btrfs)
+ _require_btrfs_command inspect-internal dump-super
+ _require_btrfs_command inspect-internal dump-tree
+
# 3g for btrfs to have distinct bgs
_require_fs_space $TEST_DIR 3145728
fssize=3000
-else
- _require_fs_space $TEST_DIR 307200
- fssize=$(_small_fs_size_mb 300) # 200m phys/virt size
-fi
-
-[ "$FSTYP" = "ext4" ] && _require_dumpe2fs
-[ "$FSTYP" = "btrfs" ] && _require_btrfs_command inspect-internal dump-super
-[ "$FSTYP" = "btrfs" ] && _require_btrfs_command inspect-internal dump-tree
+ ;;
+ext4)
+ _require_dumpe2fs
+ ;;
+xfs)
+ ;;
+*)
+ _notrun "Requires fs-specific way to check discard ranges"
+esac
# Override the default cleanup function.
_cleanup()
--
2.43.0
next prev parent reply other threads:[~2024-06-23 12:11 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-23 12:10 mostly remove _supported_fs Christoph Hellwig
2024-06-23 12:10 ` [PATCH 1/8] remove support for ext4dev Christoph Hellwig
2024-06-23 12:10 ` [PATCH 2/8] generic/740: clean up handling of mkfs options Christoph Hellwig
2024-06-23 12:10 ` [PATCH 3/8] generic/740: pass the --quick option to mkfs.ntfs Christoph Hellwig
2024-06-23 12:10 ` [PATCH 4/8] generic/740: skip jffs2 as foreign fs earlier Christoph Hellwig
2024-06-23 12:10 ` [PATCH 5/8] generic/740: enable by default Christoph Hellwig
2024-06-24 16:16 ` Darrick J. Wong
2024-06-25 3:50 ` Theodore Ts'o
2024-06-25 6:00 ` Christoph Hellwig
2024-06-25 20:05 ` Theodore Ts'o
2024-06-26 4:01 ` Christoph Hellwig
2024-06-23 12:10 ` [PATCH 6/8] generic/745: rework support fs checking Christoph Hellwig
2024-06-23 12:10 ` Christoph Hellwig [this message]
2024-06-23 12:10 ` [PATCH 8/8] remove spurious _supported_fs calls Christoph Hellwig
2024-06-24 2:17 ` mostly remove _supported_fs David Disseldorp
2024-06-24 16:17 ` Darrick J. Wong
2024-07-10 6:16 ` Christoph Hellwig
2024-07-11 13:16 ` Zorro Lang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240623121103.974270-8-hch@lst.de \
--to=hch@lst.de \
--cc=fstests@vger.kernel.org \
--cc=linux-ext4@vger.kernel.org \
--cc=tytso@mit.edu \
--cc=zlang@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox