diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | test-skeleton.c | 15 |
2 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2009-08-14 Ulrich Drepper <drepper@redhat.com> + + * test-skeleton.c (signal_handler): Renamed from timeout_handler. + Also handle SIGINT. In that case only do the cleanup and then + re-raise the signal. + (main): Install handler for SIGINT. + 2009-08-10 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * stdlib/longlong.h [__sh__] (udiv_qrnnd, sub_ddmmss): Add "t" to diff --git a/test-skeleton.c b/test-skeleton.c index 23e4012..0238db6 100644 --- a/test-skeleton.c +++ b/test-skeleton.c @@ -1,5 +1,5 @@ /* Skeleton for test programs. - Copyright (C) 1998,2000-2004, 2005 Free Software Foundation, Inc. + Copyright (C) 1998,2000-2004, 2005, 2009 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -132,7 +132,7 @@ create_temp_file (const char *base, char **filename) /* Timeout handler. We kill the child and exit with an error. */ static void __attribute__ ((noreturn)) -timeout_handler (int sig __attribute__ ((unused))) +signal_handler (int sig __attribute__ ((unused))) { int killed; int status; @@ -167,6 +167,12 @@ timeout_handler (int sig __attribute__ ((unused))) CLEANUP_HANDLER; #endif + if (sig == SIGINT) + { + signal (sig, SIG_DFL); + raise (sig); + } + /* If we expected this signal: good! */ #ifdef EXPECTED_SIGNAL if (EXPECTED_SIGNAL == SIGALRM) @@ -325,9 +331,12 @@ main (int argc, char *argv[]) /* Default timeout is two seconds. */ # define TIMEOUT 2 #endif - signal (SIGALRM, timeout_handler); + signal (SIGALRM, signal_handler); alarm (TIMEOUT * timeoutfactor); + /* Make sure we clean up if the wrapper gets interrupted. */ + signal (SIGINT, signal_handler); + /* Wait for the regular termination. */ termpid = TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)); if (termpid == -1) |