getuid/getuid01: Convert to new API
PATCH v2 1/2 getuid/getuid01: Convert to new API
Signed-off-by tangmeng <[email protected]>
--- testcases/kernel/syscalls/getuid/getuid01.c | 88 ++++----------------- 1 file changed, 15 insertions(+), 73 deletions(-)
testcases/kernel/syscalls/getuid/getuid01.c +15 -73
@@ -1,84 +1,26 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved. * -* 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/ -*/ -/* -* AUTHOR : William Roske -* CO-PILOT : Dave Fenner +* AUTHOR : William Roske +* CO-PILOT : Dave Fenner */ -#include <sys/types.h> -#include <fcntl.h> -#include <errno.h> -#include <string.h> -#include <signal.h> -#include "test.h" -#include "compat_16.h" - -static void setup (void ); -static void cleanup (void ); +/*\ +* [Description] +* +* Check the basic functionality of the getuid() system call. +*/ -TCID_DEFINE (getuid01); -int TST_TOTAL =1 ; +#include "tst_test.h" +#include "compat_tst_16.h" -int main (int ac,char **av) +static void verify_getuid (void ) { -int lc; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { - - tst_count =0 ; - -TEST (GETUID (cleanup)); - -if (TEST_RETURN ==-1 ) -tst_resm (TFAIL |TTERRNO ,"getuid failed" ); -else -tst_resm (TPASS ,"getuid returned %ld" ,TEST_RETURN ); - - } - -cleanup (); -tst_exit (); +TST_EXP_POSITIVE (GETUID (),"getuid()" ); } -static void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); -TEST_PAUSE ; -} -static void cleanup (void ) -{ -} +static struct tst_test test = { + .test_all = verify_getuid, +};
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
PATCH v2 2/2 getuid/getuid03: Convert to new API
Signed-off-by tangmeng <[email protected]>
--- testcases/kernel/syscalls/getuid/getuid03.c | 96 +++++---------------- 1 file changed, 23 insertions(+), 73 deletions(-)
testcases/kernel/syscalls/getuid/getuid03.c +23 -73
@@ -1,88 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * Copyright (c) International Business Machines Corp., 2001 * Ported by Wayne Boyer -* -* 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 */ -/* -* Testcase to check the basic functionality of the getuid() system call. +/*\ +* [Description] * -* For functionality test the return value from getgid() is compared to passwd -* entry. +* Check the basic functionality of the getuid() system call +* return value against the /proc/self/status where all the +* UIDs are listed. */ -#include <pwd.h> -#include <errno.h> - -#include "test.h" -#include "compat_16.h" +#include "tst_test.h" +#include "compat_tst_16.h" -TCID_DEFINE (getuid03); -int TST_TOTAL =1 ; - -static void setup (void ); -static void cleanup (void ); - -int main (int ac,char **av) +static void verify_getuid (void ) { -struct passwd *pwent; -int lc; -uid_t uid; - -tst_parse_opts (ac, av,NULL ,NULL ); - -setup (); - -for (lc =0 ;TEST_LOOPING (lc); lc++) { +long int uid; - tst_count =0 ; +TST_EXP_POSITIVE (GETUID (),"getuid()" ); -TEST (GETUID (cleanup)); +SAFE_FILE_LINES_SCANF ("/proc/self/status" ,"Uid: %ld" , &uid); -if (TEST_RETURN ==-1 ) -tst_brkm (TBROK |TTERRNO , cleanup,"getuid failed" ); - - uid =getuid (); - pwent =getpwuid (uid); - -if (pwent ==NULL ) -tst_resm (TFAIL |TERRNO ,"getpwuid failed" ); - -UID16_CHECK (pwent->pw_uid, getuid, cleanup); - -if (pwent->pw_uid !=TEST_RETURN ) -tst_resm (TFAIL ,"getpwuid value, %d, " -"does not match getuid " -"value, %ld" , pwent->pw_uid, -TEST_RETURN ); -else -tst_resm (TPASS ,"values from getuid " -"and getpwuid match" ); - } -cleanup (); -tst_exit (); -} - -static void setup (void ) -{ -tst_sig (NOFORK ,DEF_HANDLER , cleanup); - -TEST_PAUSE ; +if (TST_RET != uid) +tst_res (TFAIL ,"Uid value list in /pro/self/status, %ld, " +"does not match getuid " +"value, %ld" , uid, +TST_RET ); +else +tst_res (TPASS ,"values from getuid " +"and /proc/self/status match" ); } -static void cleanup (void ) -{ -} +static struct tst_test test = { + .test_all = verify_getuid, +};
--
2.20.1
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp
Re: [LTP] [PATCH v2 2/2] getuid/getuid03: Convert to new API
Hi!
Pushed with several fixes, thanks.
- Rewrote the PASS/FAIL messages to be shorter and more to the point
- Added if (!TST_PASS) return; to the verify() fucntion, since if the call has failed there is no point in checking the value againts the /proc/self/stat
- There were wrong whitespaces that would have been caught by 'make check' please make sure to run it before sending patches
Signature · 5 lines
Cyril Hrubis [email protected] -- Mailing list info: https://lists.linux.it/listinfo/ltp