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-spin3.c | |
| parent | 0ac8ee53e8efbfd6e1c37094b4653f5c2dad65b5 (diff) | |
| download | glibc-7e625f7e85b4e88f10dbde35a0641742af581806.zip glibc-7e625f7e85b4e88f10dbde35a0641742af581806.tar.gz glibc-7e625f7e85b4e88f10dbde35a0641742af581806.tar.bz2 | |
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-spin3.c')
| -rw-r--r-- | nptl/tst-spin3.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nptl/tst-spin3.c b/nptl/tst-spin3.c index 8964ecc..6cb6f9d 100644 --- a/nptl/tst-spin3.c +++ b/nptl/tst-spin3.c @@ -21,6 +21,10 @@ #include <stdio.h> #include <unistd.h> +static int do_test (void); + +#define TEST_FUNCTION do_test () +#include "../test-skeleton.c" static int do_test (void) @@ -39,16 +43,11 @@ 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_spin_lock (&s); + xpthread_spin_lock (&s); puts ("2nd spin_lock returned"); return 1; } - -#define EXPECTED_SIGNAL SIGALRM -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" |