public inbox for ltp@lists.linux.it
 help / color / mirror / Atom feed
* [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API
@ 2024-12-19  6:57 Ma Xinjian via ltp
  2025-01-09  9:42 ` Petr Vorel
  0 siblings, 1 reply; 5+ messages in thread
From: Ma Xinjian via ltp @ 2024-12-19  6:57 UTC (permalink / raw)
  To: ltp, akumar

Reviewed-by: Avinesh Kumar <akumar@suse.de>
Signed-off-by: Ma Xinjian <maxj.fnst@fujitsu.com>
---
 .../set_tid_address/set_tid_address01.c       | 146 +++---------------
 1 file changed, 23 insertions(+), 123 deletions(-)

diff --git a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
index 11fa27540..e69ba0923 100644
--- a/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
+++ b/testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
@@ -1,129 +1,29 @@
-/******************************************************************************/
-/* Copyright (c) Crackerjack Project., 2007                                   */
-/*                                                                            */
-/* 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    */
-/*                                                                            */
-/******************************************************************************/
-/******************************************************************************/
-/*                                                                            */
-/* File:        set_tid_address01.c                                           */
-/*                                                                            */
-/* Description: This tests the set_tid_address() syscall                      */
-/*                                                                            */
-/* Usage:  <for command-line>                                                 */
-/* set_tid_address01 [-c n] [-e][-i n] [-I x] [-p x] [-t]                     */
-/*      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.                */
-/*              -t   : Turn on syscall timing.                                */
-/*                                                                            */
-/* Total Tests: 1                                                             */
-/*                                                                            */
-/* Test Name:   set_tid_address01                                             */
-/* History:     Porting from Crackerjack to LTP is done by                    */
-/*              Manas Kumar Nayak maknayak@in.ibm.com>                        */
-/******************************************************************************/
-
-#include <stdio.h>
-#include <errno.h>
-
-#include "test.h"
+// SPDX-License-Identifier: GPL-2.0-or-later
+/* Copyright (c) Crackerjack Project., 2007
+ * Copyright (c) Linux Test Project, 2007-2024
+ */
+
+/*\
+ * [Description]
+ *
+ * Verify the basic functionality of set_tid_address() syscall.
+ */
+
+#include "tst_test.h"
 #include "lapi/syscalls.h"
 
-char *TCID = "set_tid_address01";
-int testno;
-int TST_TOTAL = 1;
-
-/* Extern Global Functions */
-/******************************************************************************/
-/*                                                                            */
-/* Function:    cleanup                                                       */
-/*                                                                            */
-/* Description: Performs all one time clean up for this test on successful    */
-/*              completion,  premature exit or  failure. Closes all temporary */
-/*              files, removes all temporary directories exits the test with  */
-/*              appropriate return code by calling tst_exit() function.       */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits calling tst_exit(). Non '0' return code.   */
-/*              On success - Exits calling tst_exit(). With '0' return code.  */
-/*                                                                            */
-/******************************************************************************/
-void cleanup(void)
-{
-
-	tst_rmdir();
-
-	tst_exit();
-}
-
-/* Local  Functions */
-/******************************************************************************/
-/*                                                                            */
-/* Function:    setup                                                         */
-/*                                                                            */
-/* Description: Performs all one time setup for this test. This function is   */
-/*              typically used to capture signals, create temporary dirs      */
-/*              and temporary files that may be used in the course of this    */
-/*              test.                                                         */
-/*                                                                            */
-/* Input:       None.                                                         */
-/*                                                                            */
-/* Output:      None.                                                         */
-/*                                                                            */
-/* Return:      On failure - Exits by calling cleanup().                      */
-/*              On success - returns 0.                                       */
-/*                                                                            */
-/******************************************************************************/
-void setup(void)
-{
-	/* Capture signals if any */
-	/* Create temporary directories */
-	TEST_PAUSE;
-	tst_tmpdir();
-}
-
-int main(int ac, char **av)
+static void verify_set_tid_address(void)
 {
 	int newtid = -1;
-	int lc;
 
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); ++lc) {
-		tst_count = 0;
-		for (testno = 0; testno < TST_TOTAL; ++testno) {
-			TEST(tst_syscall(__NR_set_tid_address, &newtid));
-			if (TEST_RETURN == getpid()) {
-				tst_resm(TPASS,
-					 "set_tid_address call succeeded:  as expected %ld",
-					 TEST_RETURN);
-			} else {
-				tst_brkm(TFAIL, cleanup, "%s failed - errno = %d : %s",
-					 TCID, TEST_ERRNO,
-					 strerror(TEST_ERRNO));
-			}
-		}
-	}
-	cleanup();
-	tst_exit();
+	TEST(tst_syscall(__NR_set_tid_address, &newtid));
+	if (TST_RET == getpid())
+		tst_res(TPASS, "set_tid_address call succeeded: as expected %ld", TST_RET);
+	else
+		tst_res(TFAIL | TTERRNO, "set_tid_address call failed: expected %d, but got %ld", getpid(), TST_RET);
 }
+
+static struct tst_test test = {
+	.test_all = verify_set_tid_address,
+	.needs_tmpdir = 1,
+};
-- 
2.47.0


-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API
  2024-12-19  6:57 [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API Ma Xinjian via ltp
@ 2025-01-09  9:42 ` Petr Vorel
  2025-01-09 11:30   ` Petr Vorel
  0 siblings, 1 reply; 5+ messages in thread
From: Petr Vorel @ 2025-01-09  9:42 UTC (permalink / raw)
  To: Ma Xinjian; +Cc: ltp

Hi Ma Xinjian, Avinesh,

...
> +	TEST(tst_syscall(__NR_set_tid_address, &newtid));
> +	if (TST_RET == getpid())
> +		tst_res(TPASS, "set_tid_address call succeeded: as expected %ld", TST_RET);
> +	else
> +		tst_res(TFAIL | TTERRNO, "set_tid_address call failed: expected %d, but got %ld", getpid(), TST_RET);

I wanted to replace this with:

TST_EXP_EQ_LI(tst_syscall(__NR_set_tid_address, &newtid), getpid());

But that TST_EXP_EQ_LI() not use TTERRNO.

Maybe use this?

	TST_EXP_PID(tst_syscall(__NR_set_tid_address, &newtid));
	TST_EXP_EQ_LI(TST_RET, getpid());

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API
  2025-01-09  9:42 ` Petr Vorel
@ 2025-01-09 11:30   ` Petr Vorel
  2025-01-10  8:53     ` Xinjian Ma (Fujitsu) via ltp
  0 siblings, 1 reply; 5+ messages in thread
From: Petr Vorel @ 2025-01-09 11:30 UTC (permalink / raw)
  To: Ma Xinjian, ltp, akumar

> Hi Ma Xinjian, Avinesh,

> ...
> > +	TEST(tst_syscall(__NR_set_tid_address, &newtid));
> > +	if (TST_RET == getpid())
> > +		tst_res(TPASS, "set_tid_address call succeeded: as expected %ld", TST_RET);
> > +	else
> > +		tst_res(TFAIL | TTERRNO, "set_tid_address call failed: expected %d, but got %ld", getpid(), TST_RET);

> I wanted to replace this with:

> TST_EXP_EQ_LI(tst_syscall(__NR_set_tid_address, &newtid), getpid());

> But that TST_EXP_EQ_LI() not use TTERRNO.

> Maybe use this?

> 	TST_EXP_PID(tst_syscall(__NR_set_tid_address, &newtid));
> 	TST_EXP_EQ_LI(TST_RET, getpid());

OK, this is the correct one liner:
TST_EXP_VAL(tst_syscall(__NR_set_tid_address, &newtid), getpid());

Any objection to merge with change below?

Kind regards,
Petr

> Kind regards,
> Petr

+++ testcases/kernel/syscalls/set_tid_address/set_tid_address01.c
@@ -16,11 +16,7 @@ static void verify_set_tid_address(void)
 {
 	int newtid = -1;
 
-	TEST(tst_syscall(__NR_set_tid_address, &newtid));
-	if (TST_RET == getpid())
-		tst_res(TPASS, "set_tid_address call succeeded: as expected %ld", TST_RET);
-	else
-		tst_res(TFAIL | TTERRNO, "set_tid_address call failed: expected %d, but got %ld", getpid(), TST_RET);
+	TST_EXP_VAL(tst_syscall(__NR_set_tid_address, &newtid), getpid());
 }
 
 static struct tst_test test = {

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API
  2025-01-09 11:30   ` Petr Vorel
@ 2025-01-10  8:53     ` Xinjian Ma (Fujitsu) via ltp
  2025-01-10 10:59       ` Petr Vorel
  0 siblings, 1 reply; 5+ messages in thread
From: Xinjian Ma (Fujitsu) via ltp @ 2025-01-10  8:53 UTC (permalink / raw)
  To: Petr Vorel, ltp@lists.linux.it

Hi Petr

> > Hi Ma Xinjian, Avinesh,
> 
> > ...
> > > +	TEST(tst_syscall(__NR_set_tid_address, &newtid));
> > > +	if (TST_RET == getpid())
> > > +		tst_res(TPASS, "set_tid_address call succeeded: as expected %ld",
> TST_RET);
> > > +	else
> > > +		tst_res(TFAIL | TTERRNO, "set_tid_address call failed: expected
> > > +%d, but got %ld", getpid(), TST_RET);
> 
> > I wanted to replace this with:
> 
> > TST_EXP_EQ_LI(tst_syscall(__NR_set_tid_address, &newtid), getpid());
> 
> > But that TST_EXP_EQ_LI() not use TTERRNO.
> 
> > Maybe use this?
> 
> > 	TST_EXP_PID(tst_syscall(__NR_set_tid_address, &newtid));
> > 	TST_EXP_EQ_LI(TST_RET, getpid());
> 
> OK, this is the correct one liner:
> TST_EXP_VAL(tst_syscall(__NR_set_tid_address, &newtid), getpid());
> 
> Any objection to merge with change below?

Looks good.

Best regards
Ma

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API
  2025-01-10  8:53     ` Xinjian Ma (Fujitsu) via ltp
@ 2025-01-10 10:59       ` Petr Vorel
  0 siblings, 0 replies; 5+ messages in thread
From: Petr Vorel @ 2025-01-10 10:59 UTC (permalink / raw)
  To: Xinjian Ma (Fujitsu); +Cc: ltp@lists.linux.it

Hi Ma Xinjian, Avinesh,

> > Any objection to merge with change below?

> Looks good.

Good, merged!

Kind regards,
Petr

-- 
Mailing list info: https://lists.linux.it/listinfo/ltp

^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2025-01-10 11:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-12-19  6:57 [LTP] [PATCH v2] set_tid_address01: refactor with new LTP API Ma Xinjian via ltp
2025-01-09  9:42 ` Petr Vorel
2025-01-09 11:30   ` Petr Vorel
2025-01-10  8:53     ` Xinjian Ma (Fujitsu) via ltp
2025-01-10 10:59       ` Petr Vorel

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox