[LTP] [PATCH v2 1/2] getpgid01.c: Rewrite using new LTP API

[LTP] [PATCH v2 1/2] getpgid01.c: Rewrite using new LTP API

[Avinesh Kumar]

Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
 testcases/kernel/syscalls/getpgid/getpgid01.c | 156 ++++--------------
 1 file changed, 30 insertions(+), 126 deletions(-)

diff --git a/testcases/kernel/syscalls/getpgid/getpgid01.c b/testcases/kernel/syscalls/getpgid/getpgid01.c
index 060486e7e..2c874d855 100644
--- a/testcases/kernel/syscalls/getpgid/getpgid01.c
+++ b/testcases/kernel/syscalls/getpgid/getpgid01.c
@@ -1,145 +1,49 @@
+// 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
+ *   07/2001 Ported by Wayne Boyer
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
  */
 
-/*
- * NAME
- * 	getpgid01.c
- *
- * DESCRIPTION
- *	Testcase to check the basic functionality of getpgid().
- *
- * ALGORITHM
- * 	block1: Does getpgid(0), and checks for error.
- * 	block2: Does getpgid(getpid()) and checks for error.
- * 	block3: Does getpgid(getppid()) and checks for error.
- * 	block4: Verifies that getpgid(getpgid(0)) == getpgid(0).
- * 	block5: Does getpgid(1) and checks for error.
+/*\
+ * [Description]
  *
- * USAGE
- * 	getpgid01
- *
- * HISTORY
- *	07/2001 Ported by Wayne Boyer
- *
- * RESTRICTIONS
- *	Expects that there are no EPERM limitations on getting the
- *	process group ID from proc 1 (init).
+ * Verify the basic functionality of getpgid(2) syscall.
  */
-#define _GNU_SOURCE 1
-
-#include <errno.h>
-#include <unistd.h>
-#include <stdarg.h>
-#include <sys/wait.h>
-#include <sys/types.h>
-#include "test.h"
 
-void setup(void);
-void cleanup(void);
+#include "tst_test.h"
 
-char *TCID = "getpgid01";
-int TST_TOTAL = 1;
-
-int main(int ac, char **av)
+static void run(void)
 {
-	int lc;
-
-	register int pgid_0, pgid_1;
-	register int my_pid, my_ppid;
-	int ex_stat;
-
-	tst_parse_opts(ac, av, NULL, NULL);
+	pid_t pid_1, child_pid, pgid;
 
-	setup();
+	pgid = getpgid(0);
+	tst_res(TINFO, "getpgid(0) in parent = %d", pgid);
 
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-		tst_count = 0;
+	pid_1 = SAFE_FORK();
+	if (!pid_1) {
+		child_pid = getpid();
 
-		if ((pgid_0 = FORK_OR_VFORK()) == -1)
-			tst_brkm(TBROK, cleanup, "fork failed");
-		if (pgid_0 > 0) {
-			while ((pgid_0 = wait(&ex_stat)) != -1) ;
+		tst_res(TINFO, "getpid() in child = %d", child_pid);
+		tst_res(TINFO, "Running getpgid() in child");
 
-			if (WEXITSTATUS(ex_stat) == 0)
-				tst_resm(TPASS, "%s PASSED", TCID);
-			else
-				tst_resm(TFAIL, "%s FAILED", TCID);
+		TST_EXP_POSITIVE(getpgid(0));
+		TST_EXP_EQ_LI(TST_RET, pgid);
 
-			exit(0);
-		}
+		TST_EXP_POSITIVE(getpgid(child_pid), "getpgid(%d)", child_pid);
+		TST_EXP_EQ_LI(TST_RET, pgid);
 
-		if ((pgid_0 = getpgid(0)) == -1)
-			tst_resm(TFAIL | TERRNO, "getpgid(0) failed");
-		else
-			tst_resm(TPASS, "getpgid(0) PASSED");
+		TST_EXP_POSITIVE(getpgid(pgid), "getpgid(%d)", pgid);
+		TST_EXP_EQ_LI(TST_RET, pgid);
 
-//block2:
-		my_pid = getpid();
-		if ((pgid_1 = getpgid(my_pid)) == -1)
-			tst_resm(TFAIL | TERRNO, "getpgid(%d) failed", my_pid);
-
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(my_pid=%d) != getpgid(0) "
-				 "[%d != %d]", my_pid, pgid_1, pgid_0);
-		} else
-			tst_resm(TPASS, "getpgid(getpid()) PASSED");
-
-//block3:
-		my_ppid = getppid();
-		if ((pgid_1 = getpgid(my_ppid)) == -1)
-			tst_resm(TFAIL | TERRNO, "getpgid(%d) failed", my_ppid);
-
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(%d) != getpgid(0) [%d != %d]",
-				 my_ppid, pgid_1, pgid_0);
-		} else
-			tst_resm(TPASS, "getpgid(getppid()) PASSED");
-
-//block4:
-		if ((pgid_1 = getpgid(pgid_0)) < 0)
-			tst_resm(TFAIL | TERRNO, "getpgid(%d) failed", pgid_0);
-
-		if (pgid_0 != pgid_1) {
-			tst_resm(TFAIL, "getpgid(%d) != getpgid(0) [%d != %d]",
-				 pgid_0, pgid_1, pgid_0);
-		} else
-			tst_resm(TPASS, "getpgid(%d) PASSED", pgid_0);
-
-//block5:
-		if (getpgid(1) < 0)
-			tst_resm(TFAIL | TERRNO, "getpgid(1) failed");
-		else
-			tst_resm(TPASS, "getpgid(1) PASSED");
+		TST_EXP_POSITIVE(getpgid(1));
+		TST_EXP_EQ_LI(TST_RET, 1);
 	}
-	cleanup();
-	tst_exit();
 
+	tst_reap_children();
 }
 
-void setup(void)
-{
-
-	tst_sig(FORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
-}
-
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = run,
+	.forks_child = 1
+};
-- 
2.40.0


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

[LTP] [PATCH v2 2/2] getpgrp01: Convert to new LTP API

[Avinesh Kumar]

Signed-off-by: Avinesh Kumar <akumar@suse.de>
---
 testcases/kernel/syscalls/getpgrp/getpgrp01.c | 166 ++----------------
 1 file changed, 15 insertions(+), 151 deletions(-)

diff --git a/testcases/kernel/syscalls/getpgrp/getpgrp01.c b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
index 61feba8d1..0d5f8db90 100644
--- a/testcases/kernel/syscalls/getpgrp/getpgrp01.c
+++ b/testcases/kernel/syscalls/getpgrp/getpgrp01.c
@@ -1,160 +1,24 @@
+// SPDX-License-Identifier: GPL-2.0
 /*
  * 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
+ * Copyright (c) 2023 SUSE LLC Avinesh Kumar <avinesh.kumar@suse.com>
  */
-/* $Id: getpgrp01.c,v 1.6 2009/10/26 14:55:47 subrata_modak Exp $ */
-/**********************************************************
- *
- *    OS Test - Silicon Graphics, Inc.
- *
- *    TEST IDENTIFIER	: getpgrp01
- *
- *    EXECUTED BY	: anyone
- *
- *    TEST TITLE	: Basic test for getpgrp(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.) getpgrp(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 getpgrp(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
- *	getpgrp(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 <signal.h>
-#include <string.h>
-#include "test.h"
-
-void setup();
-void cleanup();
-
-char *TCID = "getpgrp01";
-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++) {
-
-		tst_count = 0;
-
-		TEST(getpgrp());
-
-		if (TEST_RETURN == -1)
-			tst_resm(TFAIL | TTERRNO, "getpgrp failed");
-		else
-			tst_resm(TPASS, "getpgrp returned %ld", TEST_RETURN);
-
-	}
+/*\
+ * [Description]
+ *
+ * Verify that getpgrp(2) syscall executes successfully.
+ */
 
-	cleanup();
-	tst_exit();
-}
+#include "tst_test.h"
 
-void setup(void)
+static void run(void)
 {
-
-	tst_sig(NOFORK, DEF_HANDLER, cleanup);
-
-	TEST_PAUSE;
+	TST_EXP_POSITIVE(getpgrp());
+	TST_EXP_EQ_LI(TST_RET, SAFE_GETPGID(0));
 }
 
-void cleanup(void)
-{
-}
+static struct tst_test test = {
+	.test_all = run
+};
-- 
2.40.0


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

Re: [LTP] [PATCH v2 1/2] getpgid01.c: Rewrite using new LTP API

[Cyril Hrubis]

Hi!
> +		TST_EXP_POSITIVE(getpgid(1));

Actually I did remmmeber that we do have TST_EXP_PID() which should be
more fitting here, since getpgid() returns a PID. Do you agree with
changing these in the two tests before applying?

-- 
Cyril Hrubis
chrubis@suse.cz

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

Re: [LTP] [PATCH v2 1/2] getpgid01.c: Rewrite using new LTP API

[Avinesh Kumar]

Hi Cyril,

On Wednesday, April 19, 2023 4:56:39 PM IST you wrote:
> Hi!
> > +		TST_EXP_POSITIVE(getpgid(1));
> 
> Actually I did remmmeber that we do have TST_EXP_PID() which should be
> more fitting here, since getpgid() returns a PID. Do you agree with
> changing these in the two tests before applying?
Ah, I missed finding that. Please apply in both tests.
Thank you!
> 
> 
--
Regards,
Avinesh





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

Re: [LTP] [PATCH v2 1/2] getpgid01.c: Rewrite using new LTP API

[Cyril Hrubis]

Hi!
> > Actually I did remmmeber that we do have TST_EXP_PID() which should be
> > more fitting here, since getpgid() returns a PID. Do you agree with
> > changing these in the two tests before applying?
> Ah, I missed finding that. Please apply in both tests.

Applied, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz

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