Add proper filesystem skiplist
v3 cover Add proper filesystem skiplist
This adds a proper .skip_filesystems array to the tst_test structure and implements support for both test with .all_filesystems enabled and disabled.
As a bonus point we get the list of filesystems that the test does not support exported to the metadata as well.
Changes in v3:
* Moved the skiplist out of tst_fs_is_supported()
(as requested by Martin)
* Move paragraph in docs
(as requested by Peter)
Changes in v2:
* Add docs (as Jan requested)
* Move the skiplist detection from the is_supported_by_kernel() to tst_fs_is_supported()
(as requested by Martin and Li)
(which also fixed the double message reported by Peter)
* Fixed typos in tst_fs.h header (as requested by Peter)
Cyril Hrubis (4):
lib: Add proper filesystem skiplist
lib: tst_fs_type change fs names to lowercase
lib: Apply the skip_filesystems to rest of test as well
doc: Update docs on filesystem detection
doc/test-writing-guidelines.txt | 47 +++++++++---- include/tst_fs.h | 25 +++++-- include/tst_test.h | 9 ++- lib/tst_fs_type.c | 36 +++++----- lib/tst_supported_fs_types.c | 66 +++++++++++++++---- lib/tst_test.c | 14 +++- testcases/kernel/syscalls/fcntl/fcntl33.c | 19 ++---- .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- testcases/kernel/syscalls/fspick/fspick01.c | 2 +- testcases/kernel/syscalls/fspick/fspick02.c | 2 +- .../kernel/syscalls/ioctl/ioctl_loop05.c | 11 ++-- .../kernel/syscalls/move_mount/move_mount01.c | 2 +- .../kernel/syscalls/move_mount/move_mount02.c | 2 +- .../kernel/syscalls/open_tree/open_tree01.c | 2 +- .../kernel/syscalls/open_tree/open_tree02.c | 2 +- .../sync_file_range/sync_file_range02.c | 2 +- .../kernel/syscalls/vmsplice/vmsplice01.c | 9 ++- .../kernel/syscalls/vmsplice/vmsplice02.c | 9 ++- testcases/lib/tst_supported_fs.c | 4 +- 22 files changed, 176 insertions(+), 95 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/4 lib: Add proper filesystem skiplist
The approach with flags we added for FUSE does not scale at all, we need a proper skiplist so that we can skip individual filesystems.
The motivation here is the addition of tmpfs to the supported filesystems check. One of the problems there is that sync() is no-op on tmpfs and hence the syncfs test fails. After this patchset we can simply skip syncfs test on tmpfs by setting the right skiplist.
As a bonus point the list of unsupported filesystem gets nicely propagated to the metadata as well.
--- include/tst_fs.h | 25 +++++-- include/tst_test.h | 9 ++- lib/tst_supported_fs_types.c | 66 +++++++++++++++---- lib/tst_test.c | 2 +- .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- testcases/kernel/syscalls/fspick/fspick01.c | 2 +- testcases/kernel/syscalls/fspick/fspick02.c | 2 +- .../kernel/syscalls/move_mount/move_mount01.c | 2 +- .../kernel/syscalls/move_mount/move_mount02.c | 2 +- .../kernel/syscalls/open_tree/open_tree01.c | 2 +- .../kernel/syscalls/open_tree/open_tree02.c | 2 +- .../sync_file_range/sync_file_range02.c | 2 +- testcases/lib/tst_supported_fs.c | 4 +- 16 files changed, 93 insertions(+), 35 deletions(-)
include/tst_fs.h +20 -5
@@ -167,18 +167,33 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount);*/ int tst_prealloc_file (const char *path,size_t bs,size_t bcount); -#define TST_FS_SKIP_FUSE 0x01 +enum tst_fs_type { +TST_FS_UNSUPPORTED =0 , +TST_FS_KERNEL =1 , +TST_FS_FUSE =2 , +};/* -* Return 1 if a specified fiilsystem is supported -* Return 0 if a specified fiilsystem isn't supported +* Returns if filesystem is suppored and if driver is in kernel or FUSE. +* +* @fs_type A filesystem name to check the support for. */ -int tst_fs_is_supported (const char *fs_type,int flags); +enum tst_fs_type tst_fs_is_supported (const char *fs_type);/* * Returns NULL-terminated array of kernel-supported filesystems. +* +* @skiplist A NULL terminated array of filesystems to skip. +*/ +const char **tst_get_supported_fs_types (const char *const *skiplist); + +/* +* Returns 1 if filesystem is in skiplist 0 otherwise. +* +* @fs_type A filesystem type to lookup. +* @skiplist A NULL terminated array of fileystemsytems to skip. */ -const char **tst_get_supported_fs_types (int flags); +int tst_fs_in_skiplist (const char *fs_type,const char *const *skiplist);/* * Check whether device supports FS quotas. Negative return value means that
include/tst_test.h +7 -2
@@ -159,6 +159,13 @@ struct tst_test {*/ int all_filesystems:1; +/* +* The skip_filesystem is a NULL terminated list of filesystems the +* test does not support. It can also be used to disable whole class of +* filesystems with a special keyworks such as "fuse". +*/ +const char *const *skip_filesystems; +/* Minimum number of online CPU required by the test */ unsigned long min_cpus;
@@ -197,8 +204,6 @@ struct tst_test {/* Device filesystem type override NULL == default */ const char *dev_fs_type; -/* Flags to be passed to tst_get_supported_fs_types() */ -int dev_fs_flags;/* Options passed to SAFE_MKFS() when format_device is set */ const char *const *dev_fs_opts;
lib/tst_supported_fs_types.c +52 -14
102 lines not on this page · raw message
lib/tst_test.c +1 -1
@@ -1347,7 +1347,7 @@ static int run_tcases_per_fs(void) {int ret =0 ;unsigned int i; -const char *const *filesystems =tst_get_supported_fs_types (tst_test->dev_fs_flags); +const char *const *filesystems =tst_get_supported_fs_types (tst_test->skip_filesystems);if (!filesystems[0 ])tst_brk (TCONF ,"There are no supported filesystems" );
testcases/kernel/syscalls/fsconfig/fsconfig01.c +1 -1
@@ -89,5 +89,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/fsmount/fsmount01.c +1 -1
@@ -95,5 +95,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/fsmount/fsmount02.c +1 -1
@@ -76,5 +76,5 @@ static struct tst_test test = { .mntpoint = MNTPOINT, .format_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/fsopen/fsopen01.c +1 -1
@@ -76,5 +76,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/fspick/fspick01.c +1 -1
@@ -63,5 +63,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/fspick/fspick02.c +1 -1
@@ -50,5 +50,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/move_mount/move_mount01.c +1 -1
@@ -79,5 +79,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/move_mount/move_mount02.c +1 -1
@@ -88,5 +88,5 @@ static struct tst_test test = { .format_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/open_tree/open_tree01.c +1 -1
@@ -70,5 +70,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/open_tree/open_tree02.c +1 -1
@@ -51,5 +51,5 @@ static struct tst_test test = { .mount_device = 1, .mntpoint = MNTPOINT, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, };
testcases/kernel/syscalls/sync_file_range/sync_file_range02.c +1 -1
@@ -121,7 +121,7 @@ static struct tst_test test = { .needs_root = 1, .mount_device = 1, .all_filesystems = 1, - .dev_fs_flags = TST_FS_SKIP_FUSE, + .skip_filesystems = (const char *const []){"fuse", NULL}, .mntpoint = MNTPOINT, .setup = setup, .test = run,
testcases/lib/tst_supported_fs.c +2 -2
@@ -37,9 +37,9 @@ int main(int argc, char *argv[]) }if (argv[1 ]) -return !tst_fs_is_supported (argv[1 ],0 ); +return !tst_fs_is_supported (argv[1 ]); - filesystems =tst_get_supported_fs_types (0 ); + filesystems =tst_get_supported_fs_types (NULL );for (i =0 ; filesystems[i]; i++)printf ("%s\n" , filesystems[i]);
Signature · 1 line
2.26.2
PATCH v3 1/4 lib: Add proper filesystem skiplist
Quoted 38 lines · Cyril Hrubis
The approach with flags we added for FUSE does not scale at all, we need a proper skiplist so that we can skip individual filesystems.
The motivation here is the addition of tmpfs to the supported filesystems check. One of the problems there is that
sync()is no-op on tmpfs and hence the syncfs test fails. After this patchset we can simply skip syncfs test on tmpfs by setting the right skiplist.As a bonus point the list of unsupported filesystem gets nicely propagated to the metadata as well.
Signed-off-by Cyril Hrubis <[email protected]>Signed-off-by Martin Doucha <[email protected]>--- include/tst_fs.h | 25 +++++-- include/tst_test.h | 9 ++- lib/tst_supported_fs_types.c | 66 +++++++++++++++---- lib/tst_test.c | 2 +- .../kernel/syscalls/fsconfig/fsconfig01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount01.c | 2 +- testcases/kernel/syscalls/fsmount/fsmount02.c | 2 +- testcases/kernel/syscalls/fsopen/fsopen01.c | 2 +- testcases/kernel/syscalls/fspick/fspick01.c | 2 +- testcases/kernel/syscalls/fspick/fspick02.c | 2 +- .../kernel/syscalls/move_mount/move_mount01.c | 2 +- .../kernel/syscalls/move_mount/move_mount02.c | 2 +- .../kernel/syscalls/open_tree/open_tree01.c | 2 +- .../kernel/syscalls/open_tree/open_tree02.c | 2 +- .../sync_file_range/sync_file_range02.c | 2 +- testcases/lib/tst_supported_fs.c | 4 +- 16 files changed, 93 insertions(+), 35 deletions(-)include/tst_fs.h +0
-0@@ -167,18 +167,33 @@ int tst_fill_file(const char *path, char pattern, size_t bs, size_t bcount);
include/tst_fs.h int tst_fill_file(const char *path, char pattern, · line 176
Quoted 10 lines
include/tst_fs.h +5
-1*/ int tst_prealloc_file (const char *path,size_t bs,size_t bcount); -#define TST_FS_SKIP_FUSE 0x01 +enum tst_fs_type { +TST_FS_UNSUPPORTED =0 , +TST_FS_KERNEL =1 , +TST_FS_FUSE =2 , +};
Do you think it necessary to rename 'enum tst_fs_type' to distinguish with 'fs_type'?
As it is quite similar to the 'fs_type*' series function and structure, that might mess up
the code (we even have the same name function: tst_fs_type). So, I'd like to suggest
use 'enum tst_fs_status' or 'enum tst_fs_item', or anything else.
Anyway, the remaining part of the patchset looks good.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210408/fb8243b3/attachment.htm>
PATCH v3 1/4 lib: Add proper filesystem skiplist
Hi!
Quoted 8 lines
Do you think it necessary to rename 'enum
tst_fs_type' to distinguish with 'fs_type'?As it is quite similar to the 'fs_type*' series function and structure, that might mess up
the code (we even have the same name function:tst_fs_type). So, I'd like to suggest
use 'enumtst_fs_status' or 'enumtst_fs_item', or anything else.
What about enum 'tst_fs_impl' as for filesystem implementation?
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 1/4 lib: Add proper filesystem skiplist
Quoted 5 lines · Cyril Hrubis
Hi!
Quoted 1 line
Do you think it necessary to rename 'enum
tst_fs_type' to distinguishwith
Quoted 2 lines
'
fs_type'?
Quoted 8 lines
Quoted 5 lines
As it is quite similar to the 'fs_type*' series function and structure, that might mess up
the code (we even have the same name function:tst_fs_type). So, I'd like to suggest
use 'enumtst_fs_status' or 'enumtst_fs_item', or anything else.What about enum '
tst_fs_impl' as for filesystem implementation?
Fine.
Signature · 5 lines
Regards, Li Wang -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.linux.it/pipermail/ltp/attachments/20210408/54845e27/attachment-0001.htm>
PATCH v3 2/4 lib: tst_fs_type change fs names to lowercase
In reply to Cyril HrubisTo make it consistent with the rest of the library.
--- lib/tst_fs_type.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-)
lib/tst_fs_type.c +18 -18
@@ -47,46 +47,46 @@ const char *tst_fs_type_name(long f_type) {switch (f_type) {case TST_TMPFS_MAGIC : -return "TMPFS" ; +return "tmpfs" ;case TST_NFS_MAGIC : -return "NFS" ; +return "nfs" ;case TST_V9FS_MAGIC : -return "9P" ; +return "9p" ;case TST_RAMFS_MAGIC : -return "RAMFS" ; +return "ramfs" ;case TST_BTRFS_MAGIC : -return "BTRFS" ; +return "btrfs" ;case TST_XFS_MAGIC : -return "XFS" ; +return "xfs" ;case TST_EXT2_OLD_MAGIC : -return "EXT2" ; +return "ext2" ;case TST_EXT234_MAGIC : -return "EXT2/EXT3/EXT4" ; +return "ext2/ext3/ext4" ;case TST_MINIX_MAGIC :case TST_MINIX_MAGIC2 :case TST_MINIX2_MAGIC :case TST_MINIX2_MAGIC2 :case TST_MINIX3_MAGIC : -return "MINIX" ; +return "minix" ;case TST_UDF_MAGIC : -return "UDF" ; +return "udf" ;case TST_SYSV2_MAGIC :case TST_SYSV4_MAGIC : -return "SYSV" ; +return "sysv" ;case TST_UFS_MAGIC :case TST_UFS2_MAGIC : -return "UFS" ; +return "ufs" ;case TST_F2FS_MAGIC : -return "F2FS" ; +return "f2fs" ;case TST_NILFS_MAGIC : -return "NILFS" ; +return "nilfs" ;case TST_EXOFS_MAGIC : -return "EXOFS" ; +return "exofs" ;case TST_OVERLAYFS_MAGIC : -return "OVERLAYFS" ; +return "overlayfs" ;case TST_FUSE_MAGIC : -return "FUSE" ; +return "fuse" ;default : -return "Unknown" ; +return "unknown" ; } }
Signature · 1 line
2.26.2
PATCH v3 3/4 lib: Apply the skip_filesystems to rest of test as well
In reply to Cyril HrubisThere is no reason to use the newly introduced .skip_filesystems only for .all_filesystems tests.
So if .all_filesystems is not enabled and .skip_filesystems is set we check if test temporary directory filesystem type is in the list of supported filesystem types.
--- lib/tst_test.c | 12 ++++++++++++ testcases/kernel/syscalls/fcntl/fcntl33.c | 19 +++++++------------ .../kernel/syscalls/ioctl/ioctl_loop05.c | 11 +++++------ .../kernel/syscalls/vmsplice/vmsplice01.c | 9 ++++----- .../kernel/syscalls/vmsplice/vmsplice02.c | 9 ++++----- 5 files changed, 32 insertions(+), 28 deletions(-)
lib/tst_test.c +12 -0
@@ -1051,6 +1051,18 @@ static void do_test_setup(void) { main_pid =getpid (); +if (!tst_test->all_filesystems && tst_test->skip_filesystems) { +long fs_type =tst_fs_type ("." ); +const char *fs_name =tst_fs_type_name (fs_type); + +if (tst_fs_in_skiplist (fs_name, tst_test->skip_filesystems)) { +tst_brk (TCONF ,"Skipping %s as requested by the test" , + fs_name); + }else { +tst_res (TINFO ,"%s is supported by the test" , fs_name); + } + } +if (tst_test->caps)tst_cap_setup (tst_test->caps,TST_CAP_REQ );
testcases/kernel/syscalls/fcntl/fcntl33.c +7 -12
@@ -81,17 +81,6 @@ static void setup(void)SAFE_FILE_SCANF (PATH_LS_BRK_T ,"%d" , &ls_brk_t);SAFE_FILE_PRINTF (PATH_LS_BRK_T ,"%d" ,45 ); -switch ((type =tst_fs_type ("." ))) { -case TST_NFS_MAGIC : -case TST_RAMFS_MAGIC : -case TST_TMPFS_MAGIC : -tst_brk (TCONF , -"Cannot do fcntl(F_SETLEASE, F_WRLCK) on %s filesystem" , -tst_fs_type_name (type)); -default : -break ; - } -SAFE_TOUCH ("file" ,FILE_MODE ,NULL );sigemptyset (&newset);
@@ -230,5 +219,11 @@ static struct tst_test test = { .tcnt = ARRAY_SIZE(test_cases), .setup = setup, .test = do_test, - .cleanup = cleanup + .cleanup = cleanup, + .skip_filesystems = (const char *const []) { +"tmpfs" , +"ramfs" , +"nfs" , +NULL + }, };
testcases/kernel/syscalls/ioctl/ioctl_loop05.c +5 -6
@@ -98,12 +98,6 @@ static void setup(void) {char bd_path[100 ]; -if (tst_fs_type ("." ) ==TST_TMPFS_MAGIC ) -tst_brk (TCONF ,"tmpfd doesn't support O_DIRECT flag" ); - -if (tst_fs_type ("." ) ==TST_OVERLAYFS_MAGIC ) -tst_brk (TCONF ,"device isn't properly detected in overlay fs" ); - dev_num =tst_find_free_loopdev (dev_path,sizeof (dev_path));if (dev_num <0 )tst_brk (TBROK ,"Failed to find free loop device" );
@@ -151,6 +145,11 @@ static struct tst_test test = { .test_all = verify_ioctl_loop, .needs_root = 1, .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { +"tmpfs" , +"overlayfs" , +NULL + }, .needs_drivers = (const char *const []) {"loop" ,NULL
testcases/kernel/syscalls/vmsplice/vmsplice01.c +4 -5
@@ -103,11 +103,6 @@ static void setup(void) {int i; -if (tst_fs_type ("." ) ==TST_NFS_MAGIC ) { -tst_brk (TCONF ,"Cannot do splice() " -"on a file located on an NFS filesystem" ); - } -for (i =0 ; i <TEST_BLOCK_SIZE ; i++) buffer[i] = i &0xff ; }
@@ -123,5 +118,9 @@ static struct tst_test test = { .cleanup = cleanup, .test_all = vmsplice_test, .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { +"nfs" , +NULL + }, .min_kver = "2.6.17", };
testcases/kernel/syscalls/vmsplice/vmsplice02.c +4 -5
@@ -52,11 +52,6 @@ static struct tcase {static void setup (void ) { -if (tst_fs_type ("." ) ==TST_NFS_MAGIC ) { -tst_brk (TCONF ,"Cannot do splice() " -"on a file located on an NFS filesystem" ); - } - filefd =SAFE_OPEN (TESTFILE ,O_WRONLY |O_CREAT ,0644 );SAFE_PIPE (pipes);
@@ -106,5 +101,9 @@ static struct tst_test test = { .test = vmsplice_verify, .tcnt = ARRAY_SIZE(tcases), .needs_tmpdir = 1, + .skip_filesystems = (const char *const []) { +"nfs" , +NULL + }, .min_kver = "2.6.17", };
Signature · 1 line
2.26.2
PATCH v3 3/4 lib: Apply the skip_filesystems to rest of test as well
Hello,
the whole patchset looks great, just a small nit below.
Quoted 21 lines · Cyril Hrubis
There is no reason to use the newly introduced .skip_filesystems only for .all_filesystems tests.
So if .all_filesystems is not enabled and .skip_filesystems is set we check if test temporary directory filesystem type is in the list of supported filesystem types.
Signed-off-by Cyril Hrubis <[email protected]>--- lib/tst_test.c | 12 ++++++++++++ testcases/kernel/syscalls/fcntl/fcntl33.c | 19 +++++++------------ .../kernel/syscalls/ioctl/ioctl_loop05.c | 11 +++++------ .../kernel/syscalls/vmsplice/vmsplice01.c | 9 ++++----- .../kernel/syscalls/vmsplice/vmsplice02.c | 9 ++++----- 5 files changed, 32 insertions(+), 28 deletions(-)lib/tst_test.c +0
-0
lib/tst_test.c static void do_test_setup(void) · line 1060
Quoted 10 lines
lib/tst_test.c +7
-0@@ -1051,6 +1051,18 @@ static void do_test_setup(void) { main_pid =getpid (); +if (!tst_test->all_filesystems && tst_test->skip_filesystems) { +long fs_type =tst_fs_type ("." ); +const char *fs_name =tst_fs_type_name (fs_type); + +if (tst_fs_in_skiplist (fs_name, tst_test->skip_filesystems)) { +tst_brk (TCONF ,"Skipping %s as requested by the test" , + fs_name);
This message might be a little confusing when the test didn't ask for all filesystems. I'd recommend something like "Test does not support %s workdir, skipping". The else clause below is probably unnecessary.
But feel free to push as is if you disagree.
Quoted 8 lines
lib/tst_test.c +5
-0+ }else { +tst_res (TINFO ,"%s is supported by the test" , fs_name); + } + } +if (tst_test->caps)tst_cap_setup (tst_test->caps,TST_CAP_REQ );
Signature · 7 lines
Martin Doucha [email protected] QA Engineer for Software Maintenance SUSE LINUX, s.r.o. CORSO IIa Krizikova 148/34 186 00 Prague 8 Czech Republic
PATCH v3 3/4 lib: Apply the skip_filesystems to rest of test as well
Hi!
Quoted 7 lines
lib/tst_test.c static void do_test_setup(void) · line 1060
Quoted 3 lines
lib/tst_test.c +3
-0+if (tst_fs_in_skiplist (fs_name, tst_test->skip_filesystems)) { +tst_brk (TCONF ,"Skipping %s as requested by the test" , + fs_name);This message might be a little confusing when the test didn't ask for all filesystems. I'd recommend something like "Test does not support %s workdir, skipping". The else clause below is probably unnecessary.
I've adjusted the message to "%s is not supported by the test" and fixed the enum name as reported by Li and pushed the patchset.
Thanks a lot for the reviews.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v3 4/4 doc: Update docs on filesystem detection
In reply to Cyril Hrubis--- doc/test-writing-guidelines.txt | 47 +++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 14 deletions(-)
doc/test-writing-guidelines.txt +33 -14
@@ -978,39 +978,58 @@ LTP_ALIGN(x, a) Aligns the x to be next multiple of a. The a must be power of 2. -2.2.13 Filesystem type detection -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ +2.2.13 Filesystem type detection and skiplist +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Some tests are known to fail on certain filesystems (you cannot swap on TMPFS, there are unimplemented 'fcntl()' etc.). -If your test needs to be skipped on certain filesystems, use the interface -below: +If your test needs to be skipped on certain filesystems use the +'.skip_filesystems' field in the tst_test structure as follows: [source,c] ------------------------------------------------------------------------------- #include "tst_test.h" - /* - * Unsupported only on NFS. - */ - if (tst_fs_type(".") == TST_NFS_MAGIC) - tst_brk(TCONF, "Test not supported on NFS filesystem"); +static struct tst_test test = { + ... + .skip_filesystems = (const char *const []) { + "tmpfs", + "ramfs", + "nfs", + NULL + }, +}; +------------------------------------------------------------------------------- +When the '.all_filesystem' flag is set the '.skip_filesystems' list is passed +to the function that detects supported filesystems any listed filesystem is +not included in the resulting list of supported filesystems. - /* - * Unsupported on NFS, TMPFS and RAMFS - */ - long type; +If test needs to adjust expectations based on filesystem type it's also +possible to detect filesystem type at the runtime. This is preferably used +when only subset of the test is not applicable for a given filesystem. + +[source,c] +------------------------------------------------------------------------------- +#include "tst_test.h" + +static void run(void) +{ + ... switch ((type = tst_fs_type("."))) { case TST_NFS_MAGIC: case TST_TMPFS_MAGIC: case TST_RAMFS_MAGIC: - tst_brk(TCONF, "Test not supported on %s filesystem", + tst_brk(TCONF, "Subtest not supported on %s", tst_fs_type_name(type)); + return; break; } + + ... +} ------------------------------------------------------------------------------- 2.2.14 Thread-safety in the LTP library
Signature · 1 line
2.26.2
v3 cover Add proper filesystem skiplist
In reply to Cyril HrubisHi Cyril,
I like using enum and other changes, thanks!
to whole patchset:
Kind regards,
Petr
v3 cover Add proper filesystem skiplist
In reply to Cyril HrubisHi!
Li, Jan does you Ack, Reviewed-by for the previous version apply for the v3 as well?
Signature · 2 lines
Cyril Hrubis [email protected]