syscalls/link: Convert to new API and merge link06 and link07 into link04
PATCH v3 1/2 syscalls/link: Convert to new API and merge link06 and link07 into link04
Signed-off-by tangmeng <[email protected]>
--- runtest/syscalls | 2 - testcases/kernel/syscalls/link/link04.c | 208 +++++++++++------------- testcases/kernel/syscalls/link/link06.c | 113 ------------- testcases/kernel/syscalls/link/link07.c | 118 -------------- 4 files changed, 93 insertions(+), 348 deletions(-) delete mode 100644 testcases/kernel/syscalls/link/link06.c delete mode 100644 testcases/kernel/syscalls/link/link07.c
runtest/syscalls +0 -2
@@ -673,8 +673,6 @@ link02 link02 link03 link03 link04 link04 link05 link05 -link06 link06 -link07 link07 link08 link08 #linkat test cases
testcases/kernel/syscalls/link/link04.c +93 -115
250 lines not on this page · raw message
testcases/kernel/syscalls/link/link06.c deleted +0 -113
113 lines not on this page · raw message
testcases/kernel/syscalls/link/link07.c deleted +0 -118
118 lines not on this page · raw message
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v333 2/2 link/link05: Convert to new API
Signed-off-by tangmeng <[email protected]>
--- testcases/kernel/syscalls/link/link05.c | 159 ++++++------------------ 1 file changed, 37 insertions(+), 122 deletions(-)
testcases/kernel/syscalls/link/link05.c +37 -122
@@ -1,161 +1,76 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. * AUTHOR : Richard Logan * CO-PILOT : William Roske * Copyright (c) 2014 Cyril Hrubis <[email protected]> -* -* 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. -* -* Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, -* Mountain View, CA 94043, or: -* -* http://www.sgi.com -* -* For further information regarding this notice, see: -* -* http://oss.sgi.com/projects/GenInfo/NoticeExplan/ */ /* * Test if link(2) fails with EMLINK. */ -#include <sys/types.h> -#include <fcntl.h> +#include <stdio.h> #include <sys/stat.h> -#include <errno.h> -#include <string.h> -#include <signal.h> -#include "test.h" -#include "safe_macros.h" - -static void setup (void ); -static void cleanup (void ); -static void help (void ); - -char *TCID ="link05" ; -int TST_TOTAL =1 ; +#include "tst_test.h" #define BASENAME "lkfile"static char fname[255 ]; -static char *links_arg; - -option_t options[] = { - {"N:" ,NULL , &links_arg}, - {NULL ,NULL ,NULL } -}; -static int nlinks =1000 ; -int main (int ac,char **av) +static void verify_link (void ) { -int lc;struct stat fbuf, lbuf;int cnt;char lname[255 ]; -tst_parse_opts (ac, av, options, &help); - -if (links_arg) { - nlinks =atoi (links_arg); - -if (nlinks ==0 ) { -tst_brkm (TBROK ,NULL , -"nlinks is not a positive number" ); - } +for (cnt =1 ; cnt < nlinks; cnt++) { +sprintf (lname,"%s%d" , fname, cnt); +TST_EXP_PASS (link (fname, lname),"link(%s, %s)" , fname, lname); } -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -for (cnt =1 ; cnt < nlinks; cnt++) { -sprintf (lname,"%s%d" , fname, cnt); -TEST (link (fname, lname)); - -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL , -"link(%s, %s) Failed, errno=%d : %s" , - fname, lname,TEST_ERRNO , -strerror (TEST_ERRNO )); - } - } - -SAFE_STAT (cleanup, fname, &fbuf); +SAFE_STAT (fname, &fbuf); -for (cnt =1 ; cnt < nlinks; cnt++) { -sprintf (lname,"%s%d" , fname, cnt); +for (cnt =1 ; cnt < nlinks; cnt++) { +sprintf (lname,"%s%d" , fname, cnt); -SAFE_STAT (cleanup, lname, &lbuf); -if (fbuf.st_nlink <=1 || lbuf.st_nlink <=1 || - (fbuf.st_nlink != lbuf.st_nlink)) { +SAFE_STAT (lname, &lbuf); +if (fbuf.st_nlink <=1 || lbuf.st_nlink <=1 || + (fbuf.st_nlink != lbuf.st_nlink)) { -tst_resm (TFAIL , -"link(%s, %s[1-%d]) ret %ld for %d " -"files, stat values do not match %d %d" , - fname, fname, nlinks, -TEST_RETURN , nlinks, - (int )fbuf.st_nlink, (int )lbuf.st_nlink); -break ; - } - } -if (cnt >= nlinks) { -tst_resm (TPASS , -"link(%s, %s[1-%d]) ret %ld for %d files, " -"stat linkcounts match %d" , - fname, fname, nlinks,TEST_RETURN , - nlinks, (int )fbuf.st_nlink); - } - -for (cnt =1 ; cnt < nlinks; cnt++) { -sprintf (lname,"%s%d" , fname, cnt); -SAFE_UNLINK (cleanup, lname); +tst_res (TFAIL , +"link(%s, %s[1-%d]) ret %ld for %d " +"files, stat values do not match %d %d" , + fname, fname, nlinks, +TST_RET , nlinks, + (int )fbuf.st_nlink, (int )lbuf.st_nlink); +break ; } } +if (cnt >= nlinks) { +tst_res (TPASS , +"link(%s, %s[1-%d]) ret %ld for %d files, " +"stat linkcounts match %d" , + fname, fname, nlinks,TST_RET , + nlinks, (int )fbuf.st_nlink); + } -cleanup (); -tst_exit (); -} - -static void help (void ) -{ -printf (" -N #links : create #links hard links every iteration\n" ); +for (cnt =1 ; cnt < nlinks; cnt++) { +sprintf (lname,"%s%d" , fname, cnt); +SAFE_UNLINK (lname); + } }static void setup (void ) { -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; - -tst_tmpdir (); -sprintf (fname,"%s_%d" ,BASENAME ,getpid ()); -SAFE_TOUCH (cleanup, fname,0700 ,NULL ); +SAFE_TOUCH (fname,0700 ,NULL ); } -static void cleanup (void ) -{ -tst_rmdir (); -} +static struct tst_test test = { + .test_all = verify_link, + .setup = setup, + .needs_tmpdir =1 , +};
Signature · 7 lines
2.20.1 -- Mailing list info: https://lists.linux.it/listinfo/ltp