| Message ID | 1688352041-4945-2-git-send-email-xuyang2018.jy@fujitsu.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [1/2] syscalls/geteuid01: Convert into new api | expand |
Hi Xu,
again, wrong formatting:
geteuid02.c:1: WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
geteuid02.c:20: ERROR: space required after that ',' (ctx:VxV)
geteuid02.c:22: ERROR: space required before the open parenthesis '('
geteuid02.c:25: ERROR: space required after that ',' (ctx:VxV)
geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO)
geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV)
geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO)
geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV)
geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO)
geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV)
geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO)
geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV)
geteuid02.c:27: ERROR: space required before the open brace '{'
geteuid02.c:27: ERROR: space required before the open parenthesis '('
geteuid02.c:30: ERROR: space required after that ',' (ctx:VxV)
geteuid02.c:31: ERROR: space required before the open brace '{'
geteuid02.c:31: ERROR: space required after that close brace '}'
geteuid02.c:33: ERROR: space required after that ',' (ctx:VxV)
...
> --- a/testcases/kernel/syscalls/geteuid/geteuid02.c
...
> +/*
+ Again:
/*\
* [Description]
> + *[Description]
> + *
> + * Check that geteuid() return value matches value from /proc/self/status.
> + */
> + TST_EXP_POSITIVE(GETEUID(),"geteuid");
...
> + if(TST_RET != uid[1]){
> + tst_res(TFAIL,
> + "geteuid() ret %ld != /proc/self/status Euid: %ld",
> + TST_RET,uid[1]);
> + }else{
> + tst_res(TPASS,
> + "geteuid() ret == /proc/self/status Euid: %ld",uid[1]);
Besides missing space around brackets (reported by make check) this could be
simplified by some of our macros:
TST_EXP_EXPR(TST_RET == uid[1],
"geteuid() ret %ld != /proc/self/status EUID: %ld",
TST_RET, uid[1]);
Kind regards,
Petr
Hi Petr, Thanks for you review, merged with your suggestion. Best Regards Yang Xu -----Original Message----- From: Petr Vorel <pvorel@suse.cz> Sent: Monday, July 3, 2023 12:58 PM To: Xu, Yang/徐 杨 <xuyang2018.jy@fujitsu.com> Cc: ltp@lists.linux.it Subject: Re: [LTP] [PATCH 2/2] syscalls/geteuid02: Convert into new api Hi Xu, again, wrong formatting: geteuid02.c:1: WARNING: Missing or malformed SPDX-License-Identifier tag in line 1 geteuid02.c:20: ERROR: space required after that ',' (ctx:VxV) geteuid02.c:22: ERROR: space required before the open parenthesis '(' geteuid02.c:25: ERROR: space required after that ',' (ctx:VxV) geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO) geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV) geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO) geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV) geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO) geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV) geteuid02.c:25: ERROR: space required after that ',' (ctx:VxO) geteuid02.c:25: ERROR: space required before that '&' (ctx:OxV) geteuid02.c:27: ERROR: space required before the open brace '{' geteuid02.c:27: ERROR: space required before the open parenthesis '(' geteuid02.c:30: ERROR: space required after that ',' (ctx:VxV) geteuid02.c:31: ERROR: space required before the open brace '{' geteuid02.c:31: ERROR: space required after that close brace '}' geteuid02.c:33: ERROR: space required after that ',' (ctx:VxV) ... > --- a/testcases/kernel/syscalls/geteuid/geteuid02.c ... > +/* + Again: /*\ * [Description] > + *[Description] > + * > + * Check that geteuid() return value matches value from /proc/self/status. > + */ > + TST_EXP_POSITIVE(GETEUID(),"geteuid"); ... > + if(TST_RET != uid[1]){ > + tst_res(TFAIL, > + "geteuid() ret %ld != /proc/self/status Euid: %ld", > + TST_RET,uid[1]); > + }else{ > + tst_res(TPASS, > + "geteuid() ret == /proc/self/status Euid: %ld",uid[1]); Besides missing space around brackets (reported by make check) this could be simplified by some of our macros: TST_EXP_EXPR(TST_RET == uid[1], "geteuid() ret %ld != /proc/self/status EUID: %ld", TST_RET, uid[1]); Kind regards, Petr
diff --git a/testcases/kernel/syscalls/geteuid/geteuid02.c b/testcases/kernel/syscalls/geteuid/geteuid02.c index e00f812..cd71ebe 100644 --- a/testcases/kernel/syscalls/geteuid/geteuid02.c +++ b/testcases/kernel/syscalls/geteuid/geteuid02.c @@ -1,79 +1,39 @@ +//SPDX-Lincense-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 */ -#include <pwd.h> -#include <errno.h> - -#include "test.h" -#include "compat_16.h" - -TCID_DEFINE(geteuid02); -int TST_TOTAL = 1; +/* + *[Description] + * + * Check that geteuid() return value matches value from /proc/self/status. + */ -static void setup(void); -static void cleanup(void); +#include "tst_test.h" +#include "compat_tst_16.h" -int main(int ac, char **av) +static void verify_geteuid(void) { - struct passwd *pwent; - int lc; - uid_t uid; - - tst_parse_opts(ac, av, NULL, NULL); + long uid[4]; - setup(); + TST_EXP_POSITIVE(GETEUID(),"geteuid"); - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; + if(!TST_PASS) + return; - TEST(GETEUID(cleanup)); + SAFE_FILE_LINES_SCANF("/proc/self/status","Uid: %ld %ld %ld %ld",&uid[0],&uid[1],&uid[2],&uid[3]); - if (TEST_RETURN == -1) - tst_brkm(TBROK | TTERRNO, cleanup, "geteuid* failed"); - - uid = geteuid(); - pwent = getpwuid(uid); - - if (pwent == NULL) - tst_resm(TFAIL | TERRNO, "getpwuid failed"); - - UID16_CHECK(pwent->pw_uid, geteuid, cleanup); - if (pwent->pw_uid != TEST_RETURN) - tst_resm(TFAIL, "getpwuid value, %d, " - "does not match geteuid " - "value, %ld", pwent->pw_uid, - TEST_RETURN); - else - tst_resm(TPASS, "values from geteuid " - "and getpwuid match"); + if(TST_RET != uid[1]){ + tst_res(TFAIL, + "geteuid() ret %ld != /proc/self/status Euid: %ld", + TST_RET,uid[1]); + }else{ + tst_res(TPASS, + "geteuid() ret == /proc/self/status Euid: %ld",uid[1]); } - - cleanup(); - tst_exit(); } -static void setup(void) -{ - tst_sig(NOFORK, DEF_HANDLER, cleanup); - TEST_PAUSE; -} - -static void cleanup(void) -{ -} +static struct tst_test test = { + .test_all = verify_geteuid +};
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com> --- testcases/kernel/syscalls/geteuid/geteuid02.c | 88 ++++++++------------------- 1 file changed, 24 insertions(+), 64 deletions(-)