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-mutex6.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) (limited to 'nptl/tst-mutex6.c') diff --git a/nptl/tst-mutex6.c b/nptl/tst-mutex6.c index 1940687fee..3e989d8f55 100644 --- a/nptl/tst-mutex6.c +++ b/nptl/tst-mutex6.c @@ -23,6 +23,11 @@ #include #include +#ifndef TEST_FUNCTION +static int do_test (void); +# define TEST_FUNCTION do_test () +#endif +#include "../test-skeleton.c" #ifndef ATTR pthread_mutexattr_t *attr; @@ -62,18 +67,10 @@ do_test (void) return 1; } - /* Set an alarm for 1 second. The wrapper will expect this. */ - alarm (1); - + delayed_exit (1); /* This call should never return. */ - pthread_mutex_lock (&m); + xpthread_mutex_lock (&m); puts ("2nd mutex_lock returned"); return 1; } - -#define EXPECTED_SIGNAL SIGALRM -#ifndef TEST_FUNCTION -# define TEST_FUNCTION do_test () -#endif -#include "../test-skeleton.c" -- cgit v1.2.3