* [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api
@ 2023-07-03 2:40 Yang Xu
2023-07-03 2:40 ` [LTP] [PATCH 2/2] syscalls/geteuid02: " Yang Xu
2023-07-03 4:31 ` [LTP] [PATCH 1/2] syscalls/geteuid01: " Petr Vorel
0 siblings, 2 replies; 6+ messages in thread
From: Yang Xu @ 2023-07-03 2:40 UTC (permalink / raw)
To: ltp
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/geteuid/geteuid01.c | 88 ++++-----------------------
1 file changed, 13 insertions(+), 75 deletions(-)
diff --git a/testcases/kernel/syscalls/geteuid/geteuid01.c b/testcases/kernel/syscalls/geteuid/geteuid01.c
index d02fb0a..0a20e51 100644
--- a/testcases/kernel/syscalls/geteuid/geteuid01.c
+++ b/testcases/kernel/syscalls/geteuid/geteuid01.c
@@ -1,87 +1,25 @@
+//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
+ * [Description]
+ *
+ * Check the basic functionality of the geteuid() system call.
*/
-#include <sys/types.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-
-#include "test.h"
-#include "compat_16.h"
+#include "tst_test.h"
+#include "compat_tst_16.h"
-static void setup(void);
-static void cleanup(void);
-
-TCID_DEFINE(geteuid01);
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+static void verify_geteuid(void)
{
- int lc;
-
- tst_parse_opts(ac, av, NULL, NULL);
-
- setup();
-
- for (lc = 0; TEST_LOOPING(lc); lc++) {
-
- tst_count = 0;
-
- TEST(GETEUID(cleanup));
-
- if (TEST_RETURN < 0) {
- tst_resm(TFAIL | TTERRNO, "geteuid failed");
- continue; /* next loop for MTKERNEL */
- }
-
- tst_resm(TPASS, "geteuid returned %ld", TEST_RETURN);
- }
-
- cleanup();
- tst_exit();
-}
-
-static void setup(void)
-{
- tst_sig(NOFORK, DEF_HANDLER, cleanup);
- TEST_PAUSE;
+ TST_EXP_POSITIVE(GETEUID(),"geteuid");
}
-static void cleanup(void)
-{
-}
+static struct tst_test test = {
+ .test_all = verify_geteuid
+};
--
1.8.3.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 6+ messages in thread* [LTP] [PATCH 2/2] syscalls/geteuid02: Convert into new api
2023-07-03 2:40 [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api Yang Xu
@ 2023-07-03 2:40 ` Yang Xu
2023-07-03 4:57 ` Petr Vorel
2023-07-03 4:31 ` [LTP] [PATCH 1/2] syscalls/geteuid01: " Petr Vorel
1 sibling, 1 reply; 6+ messages in thread
From: Yang Xu @ 2023-07-03 2:40 UTC (permalink / raw)
To: ltp
Signed-off-by: Yang Xu <xuyang2018.jy@fujitsu.com>
---
testcases/kernel/syscalls/geteuid/geteuid02.c | 88 ++++++++-------------------
1 file changed, 24 insertions(+), 64 deletions(-)
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
+};
--
1.8.3.1
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [LTP] [PATCH 2/2] syscalls/geteuid02: Convert into new api
2023-07-03 2:40 ` [LTP] [PATCH 2/2] syscalls/geteuid02: " Yang Xu
@ 2023-07-03 4:57 ` Petr Vorel
2023-07-04 10:40 ` Yang Xu (Fujitsu)
0 siblings, 1 reply; 6+ messages in thread
From: Petr Vorel @ 2023-07-03 4:57 UTC (permalink / raw)
To: Yang Xu; +Cc: ltp
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
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [LTP] [PATCH 2/2] syscalls/geteuid02: Convert into new api
2023-07-03 4:57 ` Petr Vorel
@ 2023-07-04 10:40 ` Yang Xu (Fujitsu)
0 siblings, 0 replies; 6+ messages in thread
From: Yang Xu (Fujitsu) @ 2023-07-04 10:40 UTC (permalink / raw)
To: Petr Vorel; +Cc: ltp@lists.linux.it
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
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api
2023-07-03 2:40 [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api Yang Xu
2023-07-03 2:40 ` [LTP] [PATCH 2/2] syscalls/geteuid02: " Yang Xu
@ 2023-07-03 4:31 ` Petr Vorel
2023-07-04 10:39 ` Yang Xu (Fujitsu)
1 sibling, 1 reply; 6+ messages in thread
From: Petr Vorel @ 2023-07-03 4:31 UTC (permalink / raw)
To: Yang Xu; +Cc: ltp
Hi Xu,
make check-geteuid01 reports a lot of errors.
Some of them are to compat_tst_16.h (missing static would be easy to add),
others are related to this file.
> testcases/kernel/syscalls/geteuid/geteuid01.c | 88 ++++-----------------------
> +//SPDX-License-Identifier: GPL-2.0-only
geteuid01.c:1: WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
Maybe adding your or LTP license?
...
> + * AUTHOR : William Roske
> + * CO-PILOT : Dave Fenner
Maybe just:
* Author: William Roske, Dave Fenner
> */
> /*
This must be /*\, otherwise it will to be taken by our parser.
> + * [Description]
> + *
> + * Check the basic functionality of the geteuid() system call.
> */
...
> + TST_EXP_POSITIVE(GETEUID(),"geteuid");
geteuid01.c:20: ERROR: space required after that ',' (ctx:VxV)
TST_EXP_POSITIVE(GETEUID(), "geteuid");
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api
2023-07-03 4:31 ` [LTP] [PATCH 1/2] syscalls/geteuid01: " Petr Vorel
@ 2023-07-04 10:39 ` Yang Xu (Fujitsu)
0 siblings, 0 replies; 6+ messages in thread
From: Yang Xu (Fujitsu) @ 2023-07-04 10:39 UTC (permalink / raw)
To: Petr Vorel; +Cc: ltp@lists.linux.it
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:31 PM
To: Xu, Yang/徐 杨 <xuyang2018.jy@fujitsu.com>
Cc: ltp@lists.linux.it
Subject: Re: [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api
Hi Xu,
make check-geteuid01 reports a lot of errors.
Some of them are to compat_tst_16.h (missing static would be easy to add), others are related to this file.
> testcases/kernel/syscalls/geteuid/geteuid01.c | 88
> ++++-----------------------
> +//SPDX-License-Identifier: GPL-2.0-only
geteuid01.c:1: WARNING: Missing or malformed SPDX-License-Identifier tag in line 1
// SPDX-License-Identifier: GPL-2.0-only
> /*
> * Copyright (c) 2000 Silicon Graphics, Inc. All Rights Reserved.
Maybe adding your or LTP license?
...
> + * AUTHOR : William Roske
> + * CO-PILOT : Dave Fenner
Maybe just:
* Author: William Roske, Dave Fenner
> */
> /*
This must be /*\, otherwise it will to be taken by our parser.
> + * [Description]
> + *
> + * Check the basic functionality of the geteuid() system call.
> */
...
> + TST_EXP_POSITIVE(GETEUID(),"geteuid");
geteuid01.c:20: ERROR: space required after that ',' (ctx:VxV) TST_EXP_POSITIVE(GETEUID(), "geteuid");
Kind regards,
Petr
--
Mailing list info: https://lists.linux.it/listinfo/ltp
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-07-04 10:40 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-03 2:40 [LTP] [PATCH 1/2] syscalls/geteuid01: Convert into new api Yang Xu
2023-07-03 2:40 ` [LTP] [PATCH 2/2] syscalls/geteuid02: " Yang Xu
2023-07-03 4:57 ` Petr Vorel
2023-07-04 10:40 ` Yang Xu (Fujitsu)
2023-07-03 4:31 ` [LTP] [PATCH 1/2] syscalls/geteuid01: " Petr Vorel
2023-07-04 10:39 ` Yang Xu (Fujitsu)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox