diff options
author | Florian Weimer <fweimer@redhat.com> | 2016-08-26 19:27:16 +0200 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2016-08-26 19:40:17 +0200 |
commit | 7e625f7e85b4e88f10dbde35a0641742af581806 (patch) | |
tree | 9548c7d75393d1b9cd033ea0c875936bee6f9a52 /nptl/tst-eintr5.c | |
parent | 0ac8ee53e8efbfd6e1c37094b4653f5c2dad65b5 (diff) | |
download | glibc-7e625f7e85b4e88f10dbde35a0641742af581806.tar glibc-7e625f7e85b4e88f10dbde35a0641742af581806.tar.gz glibc-7e625f7e85b4e88f10dbde35a0641742af581806.tar.bz2 glibc-7e625f7e85b4e88f10dbde35a0641742af581806.zip |
nptl: Avoid expected SIGALRM in most tests [BZ #20432]
Before this change, several tests did not detect early deadlocks
because they used SIGALRM as the expected signal, and they ran
for the full default TIMEOUT seconds.
This commit adds a new delayed_exit function to the test skeleton,
along with several error-checking wrappers to pthread functions.
Additional error checking is introduced into several tests.
Diffstat (limited to 'nptl/tst-eintr5.c')
-rw-r--r-- | nptl/tst-eintr5.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/nptl/tst-eintr5.c b/nptl/tst-eintr5.c index be6731c798..81f900e8b9 100644 --- a/nptl/tst-eintr5.c +++ b/nptl/tst-eintr5.c @@ -24,6 +24,11 @@ #include <string.h> #include <sys/time.h> +static int do_test (void); + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" + #include "eintr.c" @@ -66,15 +71,9 @@ do_test (void) exit (1); } + delayed_exit (3); /* This call must never return. */ - e = pthread_cond_wait (&c, &m); - printf ("main: cond_wait returned: %s\n", - strerror_r (e, buf, sizeof (buf))); - - return 0; + xpthread_cond_wait (&c, &m); + puts ("error: pthread_cond_wait returned"); + return 1; } - -#define EXPECTED_SIGNAL SIGALRM -#define TIMEOUT 3 -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" |