getrlimit/getrlimit01: Convert to new API
PATCH 1/2 getrlimit/getrlimit01: Convert to new API
Signed-off-by tangmeng <[email protected]>
--- .../kernel/syscalls/getrlimit/getrlimit01.c | 90 +++++-------------- 1 file changed, 23 insertions(+), 67 deletions(-)
testcases/kernel/syscalls/getrlimit/getrlimit01.c +23 -67
@@ -1,41 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * Copyright (c) Wipro Technologies, 2002. All Rights Reserved. * Author: Suresh Babu V. <[email protected]> -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* +/*\ +* [Description] +* * Verify that getrlimit(2) call will be successful for all possible resource * types. */ -#include <stdio.h> -#include <errno.h> -#include <sys/time.h> #include <sys/resource.h> -#include "test.h" - -static void cleanup (void ); -static void setup (void ); +#include "tst_test.h" static struct rlimit rlim; -static struct test_t { +static struct tcase {int res;char *res_str; -} testcases[] = { +} tcases[] = { {RLIMIT_CPU ,"RLIMIT_CPU" }, {RLIMIT_FSIZE ,"RLIMIT_FSIZE" }, {RLIMIT_DATA ,"RLIMIT_DATA" },
@@ -60,49 +42,23 @@ static struct test_t {#endif }; -char *TCID ="getrlimit01" ; -int TST_TOTAL =ARRAY_SIZE (testcases); - -int main (int ac,char **av) +static void verify_getrlimit (unsigned int i) { -int i; -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -for (i =0 ; i <TST_TOTAL ; ++i) { - -TEST (getrlimit (testcases[i].res, &rlim)); - -if (TEST_RETURN ==-1 ) { -tst_resm (TFAIL |TTERRNO , -"getrlimit() test %s failed" , - testcases[i].res_str); - }else { -tst_resm (TPASS , -"getrlimit() test %s success" , - testcases[i].res_str); - } - } +struct tcase *tc = &tcases[i]; +TEST (getrlimit (tc->res, &rlim)); + +if (TST_RET ==-1 ) { +tst_res (TFAIL |TTERRNO , +"getrlimit() test %s failed" , + tc->res_str); + }else { +tst_res (TPASS , +"getrlimit() test %s success" , + tc->res_str); } - -cleanup (); -tst_exit (); } -static void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; -} - -static void cleanup (void ) -{ -} +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .test = verify_getrlimit, +};
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH 2/2 getrlimit/getrlimit02: Convert to new API
Signed-off-by tangmeng <[email protected]>
--- .../kernel/syscalls/getrlimit/getrlimit02.c | 154 ++++-------------- 1 file changed, 29 insertions(+), 125 deletions(-)
testcases/kernel/syscalls/getrlimit/getrlimit02.c +29 -125
@@ -1,93 +1,33 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* -* * Copyright (c) Wipro Technologies, 2002. All Rights Reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See -* the GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +* AUTHOR : Suresh Babu V. <[email protected]> */ -/**************************************************************************** -* -* TEST IDENTIFIER : getrlimit02 -* -* EXECUTED BY : anyone -* -* TEST TITLE : test for checking error conditions for getrlimit(2) -* -* TEST CASE TOTAL : 2 -* -* AUTHOR : Suresh Babu V. <[email protected]> -* -* SIGNALS -* Uses SIGUSR1 to pause before test if option set. -* (See the parse_opts(3) man page). +/*\ +* [Description] * -* DESCRIPTION -* Verify that, +* Test for checking error conditions for getrlimit(2) * 1) getrlimit(2) returns -1 and sets errno to EFAULT if an invalid * address is given for address parameter. * 2) getrlimit(2) returns -1 and sets errno to EINVAL if an invalid * resource type (RLIM_NLIMITS is a out of range resource type) is * passed. -* -* Setup: -* Setup signal handling. -* Pause for SIGUSR1 if option specified. -* -* Test: -* Loop if the proper options are given. -* Execute system call -* Check return code, if system call failed and errno set == expected errno -* Issue sys call fails with expected return value and errno. -* Otherwise, -* Issue sys call failed to produce expected error. -* -* Cleanup: -* Print errno log and/or timing stats if options given -* -* USAGE: <for command-line> -* getrlimit02 [-c n] [-e] [-i n] [-I x] [-P x] [-p] [-t] [-h] -* where, -c n : Run n copies concurrently. -* -e : Turn on errno logging. -* -i n : Execute test n times. -* -I x : Execute test for x seconds. -* -P x : Pause for x seconds between iterations. -* -p : Pause for SIGUSR1 before startingt -* -t : Turn on syscall timing. -* -h : Display usage information. -* -***************************************************************************/ -#include <stdio.h> -#include <errno.h> +*/ +#include <sys/resource.h> -#include "test.h" +#include "tst_test.h" #define RLIMIT_TOO_HIGH 1000 -char *TCID ="getrlimit02" ; - -static void cleanup (void ); -static void setup (void ); -static struct rlimit rlim; -static struct test_case_t { +static struct tcase { int exp_errno; /* Expected error no */ char *exp_errval; /* Expected error value string */ struct rlimit *rlim; /* rlimit structure */ int res_type; /* resource type */ -} testcases[] = { +} tcases[] = { #ifndef UCLINUX /* Skip since uClinux does not implement memory protection */ {
@@ -97,63 +37,27 @@ static struct test_case_t { EINVAL, "EINVAL", &rlim, RLIMIT_TOO_HIGH} }; -int TST_TOTAL =ARRAY_SIZE (testcases); -int main (int ac,char **av) +static void verify_getrlimit (unsigned int i) { -int i; -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -/* Do initial setup */ -setup (); - -/* check for looping state if -i option is given */ -for (lc =0 ;TEST_LOOPING (lc); lc++) { - tst_count =0 ; - -for (i =0 ; i <TST_TOTAL ; ++i) { - -/* -* Test the system call. -*/ -TEST (getrlimit (testcases[i].res_type, - testcases[i].rlim)); - -if ((TEST_RETURN ==-1 ) && - (TEST_ERRNO == testcases[i].exp_errno)) { -tst_resm (TPASS ,"expected failure; got %s" , - testcases[i].exp_errval); - }else { -tst_resm (TFAIL ,"call failed to produce " -"expected error; errno: %d : %s" , -TEST_ERRNO ,strerror (TEST_ERRNO )); - } - } +struct tcase *tc = &tcases[i]; +/* +* Test the system call. +*/ +TEST (getrlimit (tc->res_type, tc->rlim)); + +if ((TST_RET ==-1 ) && + (TST_ERR == tc->exp_errno)) { +tst_res (TPASS ,"expected failure; got %s" , + tc->exp_errval); + }else { +tst_res (TFAIL ,"call failed to produce " +"expected error; errno: %d : %s" , +TST_ERR ,strerror (TST_ERR )); } -/* do cleanup and exit */ -cleanup (); - -tst_exit (); -} - -/* -* setup() - performs all one time setup for this test. -*/ -void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -/* Pause if the option was specified */ -TEST_PAUSE ; } -/* -* cleanup() - performs all one time cleanup for this test -* completion or premature exit. -*/ -void cleanup (void ) -{ - -} +static struct tst_test test = { + .tcnt =ARRAY_SIZE (tcases), + .test = verify_getrlimit, +};
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Pushed with tiny changes in code indent. Thanks~
Signature · 2 lines
Regards, Li Wang
Signature · 2 lines
-- Mailing list info: https://lists.linux.it/listinfo/ltp