From 7e625f7e85b4e88f10dbde35a0641742af581806 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Fri, 26 Aug 2016 19:27:16 +0200 Subject: 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. --- nptl/tst-eintr5.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'nptl/tst-eintr5.c') 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 #include +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" -- cgit v1.2.3