asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

selftests/powerpc: Put the test in a separate process group

Browse source 
Allows us to kill the test and any children it has spawned.

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Michael Ellerman 2014-06-10 22:23:08 +10:00 committed by Benjamin Herrenschmidt
parent 0a6121cf33
commit de506f73dd
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tools/testing/selftests/powerpc/harness.c
View file

@ -30,12 +30,15 @@ int run_test(int (test_function)(void), char *name)
pid = fork(); pid = fork();
if (pid == 0) { if (pid == 0) {
setpgid(0, 0);
exit(test_function()); exit(test_function());
} else if (pid == -1) { } else if (pid == -1) {
perror("fork"); perror("fork");
return 1; return 1;
} }
setpgid(pid, pid);
/* Wake us up in timeout seconds */ /* Wake us up in timeout seconds */
alarm(TIMEOUT); alarm(TIMEOUT);
terminated = false; terminated = false;
@ -50,17 +53,20 @@ wait:
if (terminated) { if (terminated) {
printf("!! force killing %s\n", name); printf("!! force killing %s\n", name);
kill(pid, SIGKILL); kill(-pid, SIGKILL);
return 1; return 1;
} else { } else {
printf("!! killing %s\n", name); printf("!! killing %s\n", name);
kill(pid, SIGTERM); kill(-pid, SIGTERM);
terminated = true; terminated = true;
alarm(KILL_TIMEOUT); alarm(KILL_TIMEOUT);
goto wait; goto wait;
} }
} }
/* Kill anything else in the process group that is still running */
kill(-pid, SIGTERM);
if (WIFEXITED(status)) if (WIFEXITED(status))
status = WEXITSTATUS(status); status = WEXITSTATUS(status);
else { else {