mir/criu
2
0
Fork 0
mirror of https://github.com/checkpoint-restore/criu synced 2025-08-31 06:15:24 +00:00
Code Issues Releases Wiki Activity

zdtm: don't call ps from tests

Browse Source 
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.

travis-ci: success for zdtm: don't call ps from tests
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
Signed-off-by: Pavel Emelyanov <xemul@virtuozzo.com>
This commit is contained in:
Andrei Vagin
2017-01-19 22:26:00 +03:00
committed by Pavel Emelyanov
parent 1988bc6e31
commit d234b567ad
1 changed files with 0 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
test/zdtm/lib/ns.c
View File

@@ -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);