OpenE2K/glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2002-09-29 Roland McGrath <roland@redhat.com>

Browse Source 
* test-skeleton.c (timeout_handler): Use WUNTRACED flag in waitpid.
	Examine the child's status and print something different if it wasn't
	just killed by our SIGKILL.
	(main): In the child process call setpgid to put it in its own pgrp.
This commit is contained in:
Roland McGrath 2002-09-30 00:22:13 +00:00
parent d0f82f5d71
commit b79e3737ac
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
test-skeleton.c
View File

@ -128,12 +128,13 @@ __attribute__ ((noreturn))
timeout_handler (int sig __attribute__ ((unused)))
{
int killed;
int status;
/* Send signal. */
kill (pid, SIGKILL);
/* Wait for it to terminate. */
killed = waitpid (pid, NULL, WNOHANG);
killed = waitpid (pid, &status, WNOHANG|WUNTRACED);
if (killed != 0 && killed != pid)
{
perror ("Failed to killed test process");
@ -144,7 +145,17 @@ timeout_handler (int sig __attribute__ ((unused)))
CLEANUP_HANDLER;
#endif
fputs ("Timed out: killed the child process\n", stderr);
if (WIFSIGNALED (status) && WTERMSIG (status) == SIGKILL)
fputs ("Timed out: killed the child process\n", stderr);
else if (WIFSTOPPED (status))
fprintf (stderr, "Timed out: the child process was %s\n",
strsignal (WSTOPSIG (status)));
else if (WIFSIGNALED (status))
fprintf (stderr, "Timed out: the child process got signal %s\n",
strsignal (WTERMSIG (status)));
else
fprintf (stderr, "Timed out: killed the child process but it exited %d\n",
WEXITSTATUS (status));
/* Exit with an error. */
exit (1);
@ -233,6 +244,10 @@ main (int argc, char *argv[])
setrlimit (RLIMIT_CORE, &core_limit);
#endif
/* We put the test process in its own pgrp so that if it bogusly
generates any job control signals, they won't hit the whole build. */
setpgid (0, 0);
/* Execute the test function and exit with the return value. */
exit (TEST_FUNCTION);
}