[LTP] [PATCH 1/2] syscalls/getppid01: Convert to the new API

[LTP] [PATCH 1/2] syscalls/getppid01: Convert to the new API

[Shiyang Ruan]

Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
 testcases/kernel/syscalls/getppid/getppid01.c | 167 ++----------------
 1 file changed, 18 insertions(+), 149 deletions(-)

diff --git a/testcases/kernel/syscalls/getppid/getppid01.c b/testcases/kernel/syscalls/getppid/getppid01.c
index 8a4875525..d0f294929 100644
--- a/testcases/kernel/syscalls/getppid/getppid01.c
+++ b/testcases/kernel/syscalls/getppid/getppid01.c
@@ -1,160 +1,29 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * 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/
- *
  */
-/* $Id: getppid01.c,v 1.6 2009/10/26 14:55:47 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: getppid01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for getppid(2)
- *
- *    PARENT DOCUMENT	: usctpl01
- *
- *    TEST CASE TOTAL	: 1
- *
- *    WALL CLOCK TIME	: 1
- *
- *    CPU TYPES		: ALL
- *
- *    AUTHOR		: William Roske
- *
- *    CO-PILOT		: Dave Fenner
- *
- *    DATE STARTED	: 03/30/92
- *
- *    INITIAL RELEASE	: UNICOS 7.0
- *
- *    TEST CASES
- *
- * 	1.) getppid(2) returns...(See Description)
- *
- *    INPUT SPECIFICATIONS
- * 	The standard options for system call tests are accepted.
- *	(See the parse_opts(3) man page).
- *
- *    OUTPUT SPECIFICATIONS
- *$
- *    DURATION
- * 	Terminates - with frequency and infinite modes.
- *
- *    SIGNALS
- * 	Uses SIGUSR1 to pause before test if option set.
- * 	(See the parse_opts(3) man page).
- *
- *    RESOURCES
- * 	None
- *
- *    ENVIRONMENTAL NEEDS
- *      No run-time environmental needs.
- *
- *    SPECIAL PROCEDURAL REQUIREMENTS
- * 	None
- *
- *    INTERCASE DEPENDENCIES
- * 	None
- *
- *    DETAILED DESCRIPTION
- *	This is a Phase I test for the getppid(2) system call.  It is intended
- *	to provide a limited exposure of the system call, for now.  It
- *	should/will be extended when full functional tests are written for
- *	getppid(2).
- *
- * 	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 (return=-1)
- *		Log the errno and Issue a FAIL message.
- *	  Otherwise, Issue a PASS message.
- *
- * 	Cleanup:
- * 	  Print errno log and/or timing stats if options given
- *
- *
- *#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#**/
 
-#include <sys/types.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <string.h>
-#include <signal.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "getppid01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
-{
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
+/*\
+ * [DESCRIPTION]
+ * 
+ * Test whether parent process id that getpid() returns is out of range.
+\*/
 
-		tst_count = 0;
-
-		TEST(getppid());
-
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "getppid failed");
-		else
-			tst_resm(TPASS, "getppid returned %ld", TEST_RETURN);
-
-	}
-
-	cleanup();
-	tst_exit();
-}
+#include <errno.h>
+#include "tst_test.h"
 
-void setup(void)
+static void verify_getppid(void)
 {
+	pid_t ppid = getppid(), pid_max;
 
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
+	SAFE_FILE_SCANF("/proc/sys/kernel/pid_max", "%d\n", &pid_max);
 
-	TEST_PAUSE;
+	if (ppid > pid_max)
+		tst_res(TFAIL, "getppid() returned %d, out of range!", ppid);
+	else
+		tst_res(TPASS, "getppid() returned %d", ppid);
 }
 
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = verify_getppid,
+};
-- 
2.30.1

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[Shiyang Ruan]

The logic is same as syscalls/getpid02, which is to check whether
parent's pid equals child's ppid.

Signed-off-by: Shiyang Ruan <ruansy.fnst@fujitsu.com>
---
 testcases/kernel/syscalls/getppid/getppid02.c | 122 ++++--------------
 1 file changed, 27 insertions(+), 95 deletions(-)

diff --git a/testcases/kernel/syscalls/getppid/getppid02.c b/testcases/kernel/syscalls/getppid/getppid02.c
index ae3c8eb26..d0bf984dd 100644
--- a/testcases/kernel/syscalls/getppid/getppid02.c
+++ b/testcases/kernel/syscalls/getppid/getppid02.c
@@ -1,106 +1,38 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
- *
- *   Copyright (c) International Business Machines  Corp., 2001
- *
- *   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
+ * Copyright (c) International Business Machines  Corp., 2001
  */
 
-/*
- * NAME
- * 	getppid02.c
- *
- * DESCRIPTION
- * 	Testcase to check the basic functionality of the getppid() syscall.
- *
- * USAGE:  <for command-line>
- *  getppid02 [-c n] [-f] [-i n] [-I x] [-P x] [-t]
- *     where,  -c n : Run n copies concurrently.
- *             -f   : Turn off functionality Testing.
- *             -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.
+/*\
+ * [DESCRIPTION]
  *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- * 	None
- */
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <err.h>
-#include <errno.h>
-#include "test.h"
-#include "safe_macros.h"
+ * Check that getppid() in child returns the same pid as getpid() in parent.
+\*/
 
-char *TCID = "getppid02";
-int TST_TOTAL = 1;
+#include <errno.h>
 
-void setup(void);
-void cleanup(void);
+#include "tst_test.h"
 
-int main(int ac, char **av)
+static void verify_getppid(void)
 {
-
-	int lc;
-	int status;
-	pid_t pid, ppid;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
-
-		ppid = getpid();
-		pid = FORK_OR_VFORK();
-		if (pid == -1)
-			tst_brkm(TBROK, cleanup, "fork failed");
-
-		if (pid == 0) {
-			TEST(getppid());
-
-			if (TEST_RETURN != ppid)
-				errx(1, "getppid failed (%ld != %d)",
-				     TEST_RETURN, ppid);
-			else
-				printf("return value and parent's pid "
-				       "value match\n");
-			exit(0);
-		} else {
-			SAFE_WAIT(cleanup, &status);
-			if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
-				tst_resm(TFAIL,
-					 "getppid functionality incorrect");
-		}
+	pid_t proc_id;
+	pid_t pid;
+	pid_t pproc_id;
+
+	proc_id = getpid();
+	pid = SAFE_FORK();
+	if (pid == 0) {
+		pproc_id = getppid();
+
+		if (pproc_id != proc_id)
+			tst_res(TFAIL, "child's ppid(%d) not equal to parent's pid(%d)",
+				pproc_id, proc_id);
+		else
+			tst_res(TPASS, "getppid() functionality is correct");
 	}
-	cleanup();
-
-	tst_exit();
 }
 
-void setup(void)
-{
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.forks_child = 1,
+	.test_all = verify_getppid,
+};
-- 
2.30.1

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[Petr Vorel]

Hi Ruan,

> The logic is same as syscalls/getpid02, which is to check whether
> parent's pid equals child's ppid.
...

> -	for (lc = 0; TEST_LOOPING(lc); lc++) {
> -		tst_count = 0;
> -
> -		ppid = getpid();
> -		pid = FORK_OR_VFORK();
> -		if (pid == -1)
> -			tst_brkm(TBROK, cleanup, "fork failed");
> -
> -		if (pid == 0) {
> -			TEST(getppid());
> -
> -			if (TEST_RETURN != ppid)
> -				errx(1, "getppid failed (%ld != %d)",
> -				     TEST_RETURN, ppid);
> -			else
> -				printf("return value and parent's pid "
> -				       "value match\n");
> -			exit(0);
> -		} else {
> -			SAFE_WAIT(cleanup, &status);
> -			if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
> -				tst_resm(TFAIL,
> -					 "getppid functionality incorrect");
> -		}
Right, else part is safe to drop as it's being tested in fork_testrun(void).

Reviewed-by: Petr Vorel <pvorel@suse.cz>

Kind regards,
Petr

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[Petr Vorel]

Hi Ruan,

> +/*\
> + * [DESCRIPTION]
>   *
> + * Check that getppid() in child returns the same pid as getpid() in parent.
> +\*/
nit: this should be merged as */ only (drop leading \, see 96e964f97 ("docparse:
Use C standard comment end").

Kind regards,
Petr

[LTP] [PATCH 1/2] syscalls/getppid01: Convert to the new API

[Petr Vorel]

Hi Ruan,

Reviewed-by: Petr Vorel <pvorel@suse.cz>

You extended test: checking PID range, good.

> +/*\
> + * [DESCRIPTION]
> + * 
> + * Test whether parent process id that getpid() returns is out of range.
> +\*/
nit: only */

...
> +	SAFE_FILE_SCANF("/proc/sys/kernel/pid_max", "%d\n", &pid_max);

> +	if (ppid > pid_max)
> +		tst_res(TFAIL, "getppid() returned %d, out of range!", ppid);
> +	else
> +		tst_res(TPASS, "getppid() returned %d", ppid);
>  }

Kind regards,
Petr

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[ruansy.fnst]

> -----Original Message-----
> From: Petr Vorel <pvorel@suse.cz>
> Subject: Re: [LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API
> 
> Hi Ruan,
> 
> > +/*\
> > + * [DESCRIPTION]
> >   *
> > + * Check that getppid() in child returns the same pid as getpid() in parent.
> > +\*/
> nit: this should be merged as */ only (drop leading \, see 96e964f97 ("docparse:
> Use C standard comment end").
> 

Hi Petr,

Do I need to send a v2 to fix this?


--
Thanks,
Ruan Shiyang.

> Kind regards,
> Petr

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[Petr Vorel]

> > > +/*\
> > > + * [DESCRIPTION]
> > >   *
> > > + * Check that getppid() in child returns the same pid as getpid() in parent.
> > > +\*/
> > nit: this should be merged as */ only (drop leading \, see 96e964f97 ("docparse:
> > Use C standard comment end").

> Hi Petr,

> Do I need to send a v2 to fix this?
No need, we fix it before merge.

Kind regards,
Petr

[LTP] [PATCH 1/2] syscalls/getppid01: Convert to the new API

[Cyril Hrubis]

Hi!
Pushed with minor changes, thanks.

- fixed the documentation comment

- fixed the SPDX license, the original code was GPL-2.0 only and we
  can't change that unless the test is a complete rewrite

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH 2/2] syscalls/getppid02: Convert to the new API

[Cyril Hrubis]

Hi!
Here as well, pushed with minor adjustenments, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz