From: Petr Vorel <pvorel@suse.cz>
To: ltp@lists.linux.it
Cc: Richard Palethorpe <rpalethorpe@suse.com>
Subject: [LTP] [PATCH v5 05/10] tst_supported_fs: Support skip list when query single fs
Date: Fri, 9 Sep 2022 16:18:35 +0200 [thread overview]
Message-ID: <20220909141840.18327-6-pvorel@suse.cz> (raw)
In-Reply-To: <20220909141840.18327-1-pvorel@suse.cz>
And use this feature in zram01.sh
Acked-by: Richard Palethorpe <rpalethorpe@suse.com>
Reviewed-by: Li Wang <liwang@redhat.com>
Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
changes v4->v5:
* tst_fs_is_supported_skiplist() returns TST_FS_UNSUPPORTED,
errors handled in testcases/lib/tst_supported_fs.c (Cyril)
* testcases/lib/tst_supported_fs.c: put parsing code to separate
function parse_skiplist() (Cyril)
* testcases/lib/tst_supported_fs.c: Print usage on getopts error (Cyril)
* zram01.sh: use -f tmpfs in tst_supported_fs call
include/tst_fs.h | 10 ++++++++++
lib/tst_supported_fs_types.c | 16 ++++++++++++++++
testcases/kernel/device-drivers/zram/zram01.sh | 3 +--
testcases/lib/tst_supported_fs.c | 7 ++++---
4 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/include/tst_fs.h b/include/tst_fs.h
index cc6d9b547..e399aef54 100644
--- a/include/tst_fs.h
+++ b/include/tst_fs.h
@@ -183,6 +183,16 @@ enum tst_fs_impl {
*/
enum tst_fs_impl tst_fs_is_supported(const char *fs_type);
+/*
+ * Check filesystem support (@see tst_fs_is_supported()), but consider also
+ * filesystems to skip.
+ *
+ * @fs_type A filesystem name to check the support for.
+ * @skiplist A NULL terminated array of filesystems to skip.
+ */
+enum tst_fs_impl tst_fs_is_supported_skiplist(const char *fs_type, const char
+ *const *skiplist);
+
/*
* Returns NULL-terminated array of kernel-supported filesystems.
*
diff --git a/lib/tst_supported_fs_types.c b/lib/tst_supported_fs_types.c
index 9726d193a..cde162555 100644
--- a/lib/tst_supported_fs_types.c
+++ b/lib/tst_supported_fs_types.c
@@ -134,6 +134,22 @@ enum tst_fs_impl tst_fs_is_supported(const char *fs_type)
return TST_FS_UNSUPPORTED;
}
+enum tst_fs_impl tst_fs_is_supported_skiplist(const char *fs_type, const char
+ *const *skiplist)
+{
+ int ret;
+
+ ret = tst_fs_is_supported(fs_type);
+
+ if (!ret)
+ return ret;
+
+ if (tst_fs_in_skiplist(fs_type, skiplist))
+ return TST_FS_UNSUPPORTED;
+
+ return ret;
+}
+
const char **tst_get_supported_fs_types(const char *const *skiplist)
{
unsigned int i, j = 0;
diff --git a/testcases/kernel/device-drivers/zram/zram01.sh b/testcases/kernel/device-drivers/zram/zram01.sh
index ad01291bf..8b92b699f 100755
--- a/testcases/kernel/device-drivers/zram/zram01.sh
+++ b/testcases/kernel/device-drivers/zram/zram01.sh
@@ -38,8 +38,7 @@ initialize_vars()
local fs limit size stream=-1
dev_num=0
- for fs in $(tst_supported_fs); do
- [ "$fs" = "tmpfs" ] && continue
+ for fs in $(tst_supported_fs -s tmpfs); do
size="26214400"
limit="25M"
if [ "$fs" = "btrfs" ]; then
diff --git a/testcases/lib/tst_supported_fs.c b/testcases/lib/tst_supported_fs.c
index 1c259e62a..032b9d10b 100644
--- a/testcases/lib/tst_supported_fs.c
+++ b/testcases/lib/tst_supported_fs.c
@@ -81,10 +81,11 @@ int main(int argc, char *argv[])
}
if (optind < argc) {
- ret = tst_fs_is_supported(argv[optind]);
+ ret = tst_fs_is_supported_skiplist(argv[optind],
+ (const char * const*)skiplist);
if (ret == TST_FS_UNSUPPORTED)
- tst_brk(TCONF, "%s is not supported", argv[optind]);
+ tst_brk(TCONF, "%s is skipped or not supported", argv[optind]);
return !ret;
}
@@ -92,7 +93,7 @@ int main(int argc, char *argv[])
filesystems = tst_get_supported_fs_types((const char * const*)skiplist);
if (!filesystems[0])
- tst_brk(TCONF, "There are no supported filesystems");
+ tst_brk(TCONF, "There are no supported filesystems or all skipped");
for (i = 0; filesystems[i]; i++)
printf("%s\n", filesystems[i]);
--
2.37.3
--
Mailing list info: https://lists.linux.it/listinfo/ltp
next prev parent reply other threads:[~2022-09-09 14:19 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 14:18 [LTP] [PATCH v5 00/10] shell: df01.sh: $TST_ALL_FILESYSTEMS (.all_filesystems) Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 01/10] shell: Print mount command in tst_mount() Petr Vorel
2022-09-12 10:02 ` Cyril Hrubis
2022-09-09 14:18 ` [LTP] [PATCH v5 02/10] shell API/tests: Require root for format/mount tests Petr Vorel
2022-09-12 10:03 ` Cyril Hrubis
2022-09-12 10:12 ` Petr Vorel
2022-09-12 10:24 ` Cyril Hrubis
2022-09-12 11:15 ` Petr Vorel
2022-09-13 13:52 ` Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 03/10] tst_supported_fs: Print TCONF if no filesystem supported Petr Vorel
2022-09-12 14:42 ` Cyril Hrubis
2022-09-12 20:29 ` Petr Vorel
2022-09-13 8:11 ` Cyril Hrubis
2022-09-13 9:29 ` Petr Vorel
2022-09-13 13:08 ` Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 04/10] tst_supported_fs: Implement skip list Petr Vorel
2022-09-12 14:39 ` Cyril Hrubis
2022-09-12 20:15 ` Petr Vorel
2022-09-09 14:18 ` Petr Vorel [this message]
2022-09-12 11:21 ` [LTP] [PATCH v5 05/10] tst_supported_fs: Support skip list when query single fs Petr Vorel
2022-09-12 14:59 ` Cyril Hrubis
2022-09-12 20:38 ` Petr Vorel
2022-09-13 8:14 ` Cyril Hrubis
2022-09-13 9:36 ` Petr Vorel
2022-09-13 10:53 ` Cyril Hrubis
2022-09-13 13:46 ` Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 06/10] shell: Add $TST_SKIP_FILESYSTEMS + tests Petr Vorel
2022-09-12 15:10 ` Cyril Hrubis
2022-09-12 20:43 ` Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 07/10] tst_test.sh: Introduce TST_FS_TYPE_FUSE Petr Vorel
2022-09-12 15:28 ` Cyril Hrubis
2022-09-12 20:04 ` Petr Vorel
2022-09-13 8:15 ` Cyril Hrubis
2022-09-13 8:37 ` Petr Vorel
2022-09-13 14:30 ` Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 08/10] tst_test.sh: Add $TST_ALL_FILESYSTEMS Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 09/10] shell: Add tests for TST_ALL_FILESYSTEMS=1 Petr Vorel
2022-09-09 14:18 ` [LTP] [PATCH v5 10/10] df01.sh: Convert to TST_ALL_FILESYSTEMS=1 Petr Vorel
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=20220909141840.18327-6-pvorel@suse.cz \
--to=pvorel@suse.cz \
--cc=ltp@lists.linux.it \
--cc=rpalethorpe@suse.com \
/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;
as well as URLs for NNTP newsgroup(s).