* test-skeleton.c (timeout_handler): Allow expected signal to be
	SIGALRM.
This commit is contained in:
Ulrich Drepper 2002-12-07 05:39:20 +00:00
parent 85d1401f1b
commit 4614167ae7
6 changed files with 153 additions and 0 deletions

View File

@ -1,5 +1,8 @@
2002-12-06 Ulrich Drepper <drepper@redhat.com>
* test-skeleton.c (timeout_handler): Allow expected signal to be
SIGALRM.
* wctype/wcfuncs.c: Add libc_hidden_def for iswalnum.
* sysdeps/posix/raise.c: Add libc_hidden_def for raise.

View File

@ -1,5 +1,9 @@
2002-12-06 Ulrich Drepper <drepper@redhat.com>
* Makefile (tests): Add tst-stdio1 and tst-stdio2.
* tst-stdio1.c: New file.
* tst-stdio2.c: New file.
* init.c (__pthread_initialize_minimal): Correct INIT_LIST_HEAD use.
* Makefile (tests): Comment out tst-locale2 for now.

View File

@ -131,6 +131,7 @@ tests = tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \
tst-signal1 tst-signal2 tst-signal3 \
tst-exec1 tst-exec2 tst-exec3 \
tst-exit1 \
tst-stdio1 tst-stdio2 \
tst-stack1 \
tst-unload \
tst-sysconf \

57
nptl/tst-stdio1.c Normal file
View File

@ -0,0 +1,57 @@
/* Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
static void *tf (void *a)
{
flockfile (stdout);
/* This call should never return. */
return a;
}
int
do_test (void)
{
pthread_t th;
flockfile (stdout);
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
_exit (1);
}
pthread_join (th, NULL);
puts ("join returned");
return 0;
}
#define EXPECTED_SIGNAL SIGALRM
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

82
nptl/tst-stdio2.c Normal file
View File

@ -0,0 +1,82 @@
/* Copyright (C) 2002 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
The GNU C Library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */
#include <pthread.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
static void *tf (void *a)
{
puts ("start tf");
/* Multiple locking, implicitly or explicitly, must be possible. */
flockfile (stdout);
puts ("after first flockfile");
flockfile (stdout);
puts ("foo");
funlockfile (stdout);
puts ("after first funlockfile");
funlockfile (stdout);
puts ("all done");
return a;
}
int
do_test (void)
{
pthread_t th;
if (pthread_create (&th, NULL, tf, NULL) != 0)
{
write (2, "create failed\n", 14);
_exit (1);
}
void *result;
if (pthread_join (th, &result) != 0)
{
puts ("join failed");
exit (1);
}
else if (result != NULL)
{
printf ("wrong return value: %p, expected %p\n", result, NULL);
exit (1);
}
puts ("join returned succsefully");
return 0;
}
#define TEST_FUNCTION do_test ()
#include "../test-skeleton.c"

View File

@ -145,6 +145,12 @@ timeout_handler (int sig __attribute__ ((unused)))
CLEANUP_HANDLER;
#endif
/* If we expected this signal: good! */
#ifdef EXPECTED_SIGNAL
if (EXPECTED_SIGNAL == SIGALRM)
exit (0);
#endif
if (WIFSIGNALED (status) && WTERMSIG (status) == SIGKILL)
fputs ("Timed out: killed the child process\n", stderr);
else if (WIFSTOPPED (status))