[CRIU] [PATCH] zdtm: don't call ps from tests

Andrei Vagin avagin at openvz.org
Thu Jan 19 11:26:16 PST 2017


From: Andrei Vagin <avagin at virtuozzo.com>

It is an rudiment of zdtm.sh. Now we don't add ps to a test root
and we want to avoid forks in tests where it isn't supposed to be
called.

Signed-off-by: Andrei Vagin <avagin at virtuozzo.com>
---
 test/zdtm/lib/ns.c | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/test/zdtm/lib/ns.c b/test/zdtm/lib/ns.c
index 9783010..19a2b2a 100644
--- a/test/zdtm/lib/ns.c
+++ b/test/zdtm/lib/ns.c
@@ -230,19 +230,6 @@ static int ns_exec(void *_arg)
 	return -1;
 }
 
-static void show_ps(void)
-{
-	int pid;
-
-	pid = fork();
-	if (pid == 0) {
-		execl("/bin/ps", "ps", "axf", "-o", "pid,sid,comm", NULL);
-		fprintf(stderr, "Unable to execute ps: %m\n");
-		exit(1);
-	} else if (pid > 0)
-		waitpid(pid, NULL, 0);
-}
-
 int ns_init(int argc, char **argv)
 {
 	struct sigaction sa = {
@@ -293,8 +280,6 @@ int ns_init(int argc, char **argv)
 	else if (ret)
 		fprintf(stderr, "The test returned non-zero code %d\n", ret);
 
-	show_ps();
-
 	if (reap && sigaction(SIGCHLD, &sa, NULL)) {
 		fprintf(stderr, "Can't set SIGCHLD handler: %m\n");
 		exit(1);
@@ -323,8 +308,6 @@ int ns_init(int argc, char **argv)
 	/* suspend/resume */
 	test_waitsig();
 
-	show_ps();
-
 	fd = open(pidfile, O_RDONLY);
 	if (fd == -1) {
 		fprintf(stderr, "open(%s) failed: %m\n", pidfile);
-- 
2.7.4



More information about the CRIU mailing list