Port `getxattr02.c` to new test API
PATCH v2 1/1 Port `getxattr02.c` to new test API
* Utilize all_filesystems = 1-mechanism to test on various file systems instead of relying on the temporary directory's file system to support xattr (which it probably does not as it is commonly a tmpfs)
* Improve error handling
* Simplify code and description
Signed-off-by Marius Kittler <[email protected]>
--- .../kernel/syscalls/getxattr/getxattr02.c | 197 ++++++++---------- 1 file changed, 87 insertions(+), 110 deletions(-)
testcases/kernel/syscalls/getxattr/getxattr02.c +87 -110
@@ -1,28 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* Copyright (C) 2011 Red Hat, Inc. -* -* This program is free software; you can redistribute it and/or -* modify it under the terms of version 2 of the GNU General Public -* License as published by the Free Software Foundation. -* -* This program is distributed in the hope that it would be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -* -* Further, this software is distributed without any warranty that it -* is free of the rightful claim of any third person regarding -* infringement or the like. Any license provided herein, whether -* implied or otherwise, applies only to this software file. Patent -* licenses, if any, provided herein do not apply to combinations of -* this program with other software, or any other product whatsoever. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -* 02110-1301, USA. +* Copyright (C) 2011 Red Hat, Inc. +* Copyright (c) 2023 Marius Kittler <[email protected]> */ -/* +/*\ +* [Description] +* * In the user.* namespace, only regular files and directories can * have extended attributes. Otherwise getxattr(2) will return -1 * and set errno to ENODATA.
@@ -40,25 +24,17 @@#include "config.h" #include <sys/types.h> -#include <sys/stat.h> #include <sys/sysmacros.h> -#include <sys/wait.h> -#include <errno.h> -#include <fcntl.h> -#include <unistd.h> -#include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> #ifdef HAVE_SYS_XATTR_H # include <sys/xattr.h> #endif -#include "test.h" -#include "safe_macros.h" -char *TCID ="getxattr02" ; +#include "tst_test.h" +#include "tst_test_macros.h" -#ifdef HAVE_SYS_XATTR_H +#define MNTPOINT "mntpoint"#define XATTR_TEST_KEY "user.testkey"#define FIFO "getxattr02fifo"
@@ -66,94 +42,95 @@ char *TCID = "getxattr02";#define BLK "getxattr02blk"#define SOCK "getxattr02sock" -static void setup (void ); -static void cleanup (void ); +static char *workdir; -static char *tc[] = { -FIFO ,/* case 00, get attr from fifo */ -CHR ,/* case 01, get attr from char special */ -BLK ,/* case 02, get attr from block special */ -SOCK ,/* case 03, get attr from UNIX domain socket */ +struct test_case { +char *fname; +int mode; +}; +struct test_case tcases[] = { + {/* case 00, get attr from fifo */ + .fname =FIFO , + .mode =S_IFIFO , + }, + {/* case 01, get attr from char special */ + .fname =CHR , + .mode =S_IFCHR , + }, + {/* case 02, get attr from block special */ + .fname =BLK , + .mode =S_IFBLK , + }, + {/* case 03, get attr from UNIX domain socket */ + .fname =SOCK , + .mode =S_IFSOCK , + }, }; -int TST_TOTAL =sizeof (tc) /sizeof (tc[0 ]); - -int main (int argc,char *argv[]) +static void run (unsigned int i) { -int lc; -int i; -int exp_eno; -char buf[BUFSIZ ]; - -tst_parse_opts (argc, argv,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - tst_count =0 ; - exp_eno =ENODATA ; - -for (i =0 ; i <TST_TOTAL ; i++) { -TEST (getxattr (tc[0 ],XATTR_TEST_KEY , buf,BUFSIZ )); - -if (TEST_RETURN ==-1 &&TEST_ERRNO == exp_eno) -tst_resm (TPASS |TTERRNO ,"expected behavior" ); -else -tst_resm (TFAIL |TTERRNO ,"unexpected behavior" -" - expected errno %d - Got" , exp_eno); +#ifdef HAVE_SYS_XATTR_H +SAFE_CHDIR (workdir); + +/* test for xattr support in the current filesystem */ +if (i ==0 ) { +int fd =SAFE_CREAT ("testfile" ,0644 ); +close (fd); +TEST (setxattr ("testfile" ,"user.test" ,"test" ,4 ,XATTR_CREATE )); +if (TST_RET <0 ) { +if (TST_ERR ==ENOTSUP ) +tst_brk (TCONF ,"no xattr support in filesystem" ); +tst_brk (TBROK |TTERRNO ,"unexpected setxattr() return code" ); +return ; } +unlink ("testfile" ); } -cleanup (); -tst_exit (); +/* create test file */ +struct test_case *tc = &tcases[i]; +dev_t dev = tc->mode ==S_IFCHR ?makedev (1 ,3 ) :0u ; +if (mknod (tc->fname, tc->mode |0777 , dev) <0 ) +tst_brk (TBROK |TERRNO ,"create %s (mode %i) failed" , tc->fname, tc->mode); + +int exp_eno =ENODATA ; +char buf[BUFSIZ ]; +TEST (getxattr (tc->fname,XATTR_TEST_KEY , buf,BUFSIZ )); +if (TST_RET ==-1 &&TST_ERR == exp_eno) +tst_res (TPASS |TTERRNO ,"expected return value" ); +else +tst_res (TFAIL |TTERRNO ,"unexpected return value" +" - expected errno %d - got" , exp_eno); +#endif }static void setup (void ) { -int fd; -dev_t dev; - -tst_require_root (); - -tst_tmpdir (); - -/* Test for xattr support */ - fd =SAFE_CREAT (cleanup,"testfile" ,0644 ); -close (fd); -if (setxattr ("testfile" ,"user.test" ,"test" ,4 ,XATTR_CREATE ) ==-1 ) -if (errno ==ENOTSUP ) -tst_brkm (TCONF , cleanup,"No xattr support in fs or " -"mount without user_xattr option" ); -unlink ("testfile" ); - -/* Create test files */ -if (mknod (FIFO ,S_IFIFO |0777 ,0 ) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup,"Create FIFO(%s) failed" , -FIFO ); - - dev =makedev (1 ,3 ); -if (mknod (CHR ,S_IFCHR |0777 , dev) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup,"Create char special(%s)" -" failed" ,CHR ); - -if (mknod (BLK ,S_IFBLK |0777 ,0 ) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup,"Create block special(%s)" -" failed" ,BLK ); - -if (mknod (SOCK ,S_IFSOCK |0777 ,0 ) ==-1 ) -tst_brkm (TBROK |TERRNO , cleanup,"Create socket(%s) failed" , -SOCK ); - -TEST_PAUSE ; +#ifdef HAVE_SYS_XATTR_H +char *cwd =SAFE_GETCWD (NULL ,0 ); + workdir =SAFE_MALLOC (strlen (cwd) +strlen (MNTPOINT ) +2 ); +sprintf (workdir,"%s/%s" , cwd,MNTPOINT ); +free (cwd); +#else +tst_brk (TCONF ,"<sys/xattr.h> does not exist." ); +#endif } -static void cleanup (void ) -{ -tst_rmdir (); -} -#else /* HAVE_SYS_XATTR_H */ -int main (int argc,char *argv[]) -{ -tst_brkm (TCONF ,NULL ,"<sys/xattr.h> does not exist." ); -} +static struct tst_test test = { +#ifdef HAVE_SYS_XATTR_H + .all_filesystems =1 , + .needs_root =1 , + .mntpoint =MNTPOINT , + .mount_device =1 , + .skip_filesystems = (const char *const []) { +"exfat" , +"tmpfs" , +"ramfs" , +"nfs" , +"vfat" , +NULL + }, #endif + .setup = setup, + .test = run, + .tcnt =ARRAY_SIZE (tcases) +};
Signature · 5 lines
2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp