[LTP] [PATCH v1] Refactoring setpgid03.c test using new LTP API

[LTP] [PATCH v1] Refactoring setpgid03.c test using new LTP API

[Andrea Cervesato]

Removed TST_CHECKPOINT_INIT and replaced it with the .needs_checkpoints
LTP test feature. Simplified source code.

Signed-off-by: Andrea Cervesato <andrea.cervesato@suse.de>
---
 testcases/kernel/syscalls/setpgid/setpgid03.c | 183 ++++++------------
 .../kernel/syscalls/setpgid/setpgid03_child.c |  28 +--
 2 files changed, 61 insertions(+), 150 deletions(-)

diff --git a/testcases/kernel/syscalls/setpgid/setpgid03.c b/testcases/kernel/syscalls/setpgid/setpgid03.c
index 51e0eeb24..6972d6099 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03.c
@@ -1,24 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) International Business Machines  Corp., 2001
  * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
  * Copyright (c) 2014 Cyril Hrubis <chrubis@suse.cz>
- *
- * 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) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
  */
 
-/*
+/*\
+ * [Description]
+ *
  * Test to check the error and trivial conditions in setpgid system call
  *
  * EPERM   -  The calling process, process specified by pid and the target
@@ -28,136 +18,73 @@
  *            has performed exec()
  */
 
-#include <sys/wait.h>
-#include <limits.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/stat.h>
 #include <unistd.h>
-#include "test.h"
+#include <sys/wait.h>
+#include "tst_test.h"
 
 #define TEST_APP "setpgid03_child"
 
-char *TCID = "setpgid03";
-int TST_TOTAL = 1;
-
-static void do_child(void);
-static void setup(void);
-static void cleanup(void);
+static void do_child(void)
+{
+	SAFE_SETSID();
+	TST_CHECKPOINT_WAKE_AND_WAIT(0);
+}
 
-int main(int ac, char **av)
+static void run(void)
 {
-	int child_pid;
+	pid_t child_pid;
 	int status;
-	int rval;
-	int lc;
-
-	tst_parse_opts(ac, av, NULL, NULL);
-#ifdef UCLINUX
-	maybe_run_child(&do_child, "");
-#endif
-
-	setup();
-
-	for (lc = 0; TEST_LOOPING(lc); lc++) {
-
-		tst_count = 0;
-
-		/* Child is in new session we are not alowed to change pgid */
-		if ((child_pid = FORK_OR_VFORK()) == -1)
-			tst_brkm(TBROK, cleanup, "fork() failed");
-
-		if (child_pid == 0) {
-#ifdef UCLINUX
-			if (self_exec(av[0], "") < 0)
-				tst_brkm(TBROK, cleanup, "self_exec failed");
-#else
-			do_child();
-#endif
-		}
-
-		TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
-		rval = setpgid(child_pid, getppid());
-		if (rval == -1 && errno == EPERM) {
-			tst_resm(TPASS, "setpgid failed with EPERM");
-		} else {
-			tst_resm(TFAIL,
-				"retval %d, errno %d, expected errno %d",
-				rval, errno, EPERM);
-		}
-		TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
-
-		if (wait(&status) < 0)
-			tst_resm(TFAIL | TERRNO, "wait() for child 1 failed");
-
-		if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
-			tst_resm(TFAIL, "child 1 failed with status %d",
-				WEXITSTATUS(status));
-
-		/* Child after exec() we are no longer allowed to set pgid */
-		if ((child_pid = FORK_OR_VFORK()) == -1)
-			tst_resm(TFAIL, "Fork failed");
-
-		if (child_pid == 0) {
-			if (execlp(TEST_APP, TEST_APP, NULL) < 0)
-				perror("exec failed");
-
-			exit(127);
-		}
-
-		TST_SAFE_CHECKPOINT_WAIT(cleanup, 0);
-		rval = setpgid(child_pid, getppid());
-		if (rval == -1 && errno == EACCES) {
-			tst_resm(TPASS, "setpgid failed with EACCES");
-		} else {
-			tst_resm(TFAIL,
-				"retval %d, errno %d, expected errno %d",
-				rval, errno, EACCES);
-		}
-		TST_SAFE_CHECKPOINT_WAKE(cleanup, 0);
-
-		if (wait(&status) < 0)
-			tst_resm(TFAIL | TERRNO, "wait() for child 2 failed");
-
-		if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
-			tst_resm(TFAIL, "child 2 failed with status %d",
-				WEXITSTATUS(status));
+
+	child_pid = SAFE_FORK();
+	if (!child_pid) {
+		do_child();
+		return;
 	}
 
-	cleanup();
-	tst_exit();
-}
+	TST_CHECKPOINT_WAIT(0);
 
-static void do_child(void)
-{
-	if (setsid() < 0) {
-		printf("CHILD: setsid() failed, errno: %d\n", errno);
-		exit(2);
-	}
+	TEST(setpgid(child_pid, getppid()));
+	if (TST_RET == -1 && TST_ERR == EPERM)
+		tst_res(TPASS, "setpgid failed with EPERM");
+	else
+		tst_res(TFAIL, "retval %ld, errno %s, expected EPERM", TST_RET,
+			tst_strerrno(TST_ERR));
 
-	TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
+	TST_CHECKPOINT_WAKE(0);
 
-	TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
+	if (wait(&status) < 0)
+		tst_res(TFAIL, "wait() for child 1 failed");
 
-	exit(0);
-}
+	if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
+		tst_res(TFAIL, "child 1 failed with status %d",
+			WEXITSTATUS(status));
 
-static void setup(void)
-{
-	tst_sig(FORK, DEF_HANDLER, cleanup);
+	/* child after exec() we are no longer allowed to set pgid */
+	child_pid = SAFE_FORK();
+	if (!child_pid)
+		SAFE_EXECLP(TEST_APP, TEST_APP, NULL);
 
-	tst_tmpdir();
+	TST_CHECKPOINT_WAIT(0);
 
-	TST_CHECKPOINT_INIT(tst_rmdir);
+	TEST(setpgid(child_pid, getppid()));
+	if (TST_RET == -1 && TST_ERR == EACCES)
+		tst_res(TPASS, "setpgid failed with EACCES");
+	else
+		tst_res(TFAIL, "retval %ld, errno %s, expected EACCES", TST_RET,
+			tst_strerrno(TST_ERR));
 
-	umask(0);
+	TST_CHECKPOINT_WAKE(0);
 
-	TEST_PAUSE;
-}
+	if (wait(&status) < 0)
+		tst_res(TFAIL, "wait() for child 2 failed");
 
-static void cleanup(void)
-{
-	tst_rmdir();
+	if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
+		tst_res(TFAIL, "child 2 failed with status %d",
+			WEXITSTATUS(status));
 }
+
+static struct tst_test test = {
+	.test_all = run,
+	.forks_child = 1,
+	.needs_checkpoints = 1,
+};
diff --git a/testcases/kernel/syscalls/setpgid/setpgid03_child.c b/testcases/kernel/syscalls/setpgid/setpgid03_child.c
index 2657422a6..fdb22f24d 100644
--- a/testcases/kernel/syscalls/setpgid/setpgid03_child.c
+++ b/testcases/kernel/syscalls/setpgid/setpgid03_child.c
@@ -1,32 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
- *
- * 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 would 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 the Free Software Foundation,
- * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
  */
 
-#include "test.h"
-
-char *TCID = "setpgid03_child";
-
+#define TST_NO_DEFAULT_MAIN
+#include "tst_test.h"
 
 int main(void)
 {
-	TST_CHECKPOINT_INIT(NULL);
-
-	TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
-	TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
+	tst_reinit();
+	TST_CHECKPOINT_WAKE_AND_WAIT(0);
 
 	return 0;
 }
-- 
2.34.1


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

Re: [LTP] [PATCH v1] Refactoring setpgid03.c test using new LTP API

[Cyril Hrubis]

Hi!
> +	child_pid = SAFE_FORK();
> +	if (!child_pid) {
> +		do_child();
> +		return;
>  	}
>  
> -	cleanup();
> -	tst_exit();
> -}
> +	TST_CHECKPOINT_WAIT(0);
>  
> -static void do_child(void)
> -{
> -	if (setsid() < 0) {
> -		printf("CHILD: setsid() failed, errno: %d\n", errno);
> -		exit(2);
> -	}
> +	TEST(setpgid(child_pid, getppid()));
> +	if (TST_RET == -1 && TST_ERR == EPERM)
> +		tst_res(TPASS, "setpgid failed with EPERM");
> +	else
> +		tst_res(TFAIL, "retval %ld, errno %s, expected EPERM", TST_RET,
> +			tst_strerrno(TST_ERR));

Make use of the TST_EXP_FAIL() please.

> -	TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
> +	TST_CHECKPOINT_WAKE(0);
>  
> -	TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
> +	if (wait(&status) < 0)
> +		tst_res(TFAIL, "wait() for child 1 failed");
>  
> -	exit(0);
> -}
> +	if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
> +		tst_res(TFAIL, "child 1 failed with status %d",
> +			WEXITSTATUS(status));

No need to wait for the child here, just let the test library collect
it.

> -static void setup(void)
> -{
> -	tst_sig(FORK, DEF_HANDLER, cleanup);
> +	/* child after exec() we are no longer allowed to set pgid */
> +	child_pid = SAFE_FORK();
> +	if (!child_pid)
> +		SAFE_EXECLP(TEST_APP, TEST_APP, NULL);
>  
> -	tst_tmpdir();
> +	TST_CHECKPOINT_WAIT(0);
>  
> -	TST_CHECKPOINT_INIT(tst_rmdir);
> +	TEST(setpgid(child_pid, getppid()));
> +	if (TST_RET == -1 && TST_ERR == EACCES)
> +		tst_res(TPASS, "setpgid failed with EACCES");
> +	else
> +		tst_res(TFAIL, "retval %ld, errno %s, expected EACCES", TST_RET,
> +			tst_strerrno(TST_ERR));

Here as well.

> -	umask(0);
> +	TST_CHECKPOINT_WAKE(0);
>  
> -	TEST_PAUSE;
> -}
> +	if (wait(&status) < 0)
> +		tst_res(TFAIL, "wait() for child 2 failed");
>  
> -static void cleanup(void)
> -{
> -	tst_rmdir();
> +	if (!(WIFEXITED(status)) || (WEXITSTATUS(status) != 0))
> +		tst_res(TFAIL, "child 2 failed with status %d",
> +			WEXITSTATUS(status));
>  }

And here as well.

> +static struct tst_test test = {
> +	.test_all = run,
> +	.forks_child = 1,
> +	.needs_checkpoints = 1,
> +};
> diff --git a/testcases/kernel/syscalls/setpgid/setpgid03_child.c b/testcases/kernel/syscalls/setpgid/setpgid03_child.c
> index 2657422a6..fdb22f24d 100644
> --- a/testcases/kernel/syscalls/setpgid/setpgid03_child.c
> +++ b/testcases/kernel/syscalls/setpgid/setpgid03_child.c
> @@ -1,32 +1,16 @@
> +// SPDX-License-Identifier: GPL-2.0-or-later
>  /*
>   * Copyright (c) 2013 Oracle and/or its affiliates. All Rights Reserved.
> - *
> - * 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 would 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 the Free Software Foundation,
> - * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
> + * Copyright (C) 2021 SUSE LLC Andrea Cervesato <andrea.cervesato@suse.com>
>   */
>  
> -#include "test.h"
> -
> -char *TCID = "setpgid03_child";
> -
> +#define TST_NO_DEFAULT_MAIN
> +#include "tst_test.h"
>  
>  int main(void)
>  {
> -	TST_CHECKPOINT_INIT(NULL);
> -
> -	TST_SAFE_CHECKPOINT_WAKE(NULL, 0);
> -	TST_SAFE_CHECKPOINT_WAIT(NULL, 0);
> +	tst_reinit();
> +	TST_CHECKPOINT_WAKE_AND_WAIT(0);
>  
>  	return 0;
>  }
> -- 
> 2.34.1
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

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