diff options
Diffstat (limited to 'nptl/tst-mutex-errorcheck.c')
| -rw-r--r-- | nptl/tst-mutex-errorcheck.c | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/nptl/tst-mutex-errorcheck.c b/nptl/tst-mutex-errorcheck.c index 76e76dfde3..99576f8866 100644 --- a/nptl/tst-mutex-errorcheck.c +++ b/nptl/tst-mutex-errorcheck.c @@ -1,5 +1,5 @@ /* Check that error checking mutexes are not subject to lock elision. - Copyright (C) 2016-2018 Free Software Foundation, Inc. + Copyright (C) 2016-2019 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -14,12 +14,13 @@ You should have received a copy of the GNU Lesser General Public License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ + <https://www.gnu.org/licenses/>. */ #include <stdio.h> #include <errno.h> #include <time.h> #include <pthread.h> +#include <support/check.h> static int do_test (void) @@ -29,33 +30,23 @@ do_test (void) pthread_mutexattr_t mutexattr; int ret = 0; - if (pthread_mutexattr_init (&mutexattr) != 0) - return 1; - if (pthread_mutexattr_settype (&mutexattr, PTHREAD_MUTEX_ERRORCHECK) != 0) - return 1; + TEST_COMPARE (pthread_mutexattr_init (&mutexattr), 0); + TEST_COMPARE (pthread_mutexattr_settype (&mutexattr, + PTHREAD_MUTEX_ERRORCHECK), 0); - if (pthread_mutex_init (&mutex, &mutexattr) != 0) - return 1; - if (pthread_mutexattr_destroy (&mutexattr) != 0) - return 1; + TEST_COMPARE (pthread_mutex_init (&mutex, &mutexattr), 0); + TEST_COMPARE (pthread_mutexattr_destroy (&mutexattr), 0); /* The call to pthread_mutex_timedlock erroneously enabled lock elision on the mutex, which then triggered an assertion failure in pthread_mutex_unlock. It would also defeat the error checking nature of the mutex. */ - if (pthread_mutex_timedlock (&mutex, &tms) != 0) - return 1; - if (pthread_mutex_timedlock (&mutex, &tms) != EDEADLK) - { - printf ("Failed error checking on locked mutex\n"); - ret = 1; - } + TEST_COMPARE (pthread_mutex_timedlock (&mutex, &tms), 0); + TEST_COMPARE (pthread_mutex_timedlock (&mutex, &tms), EDEADLK); - if (pthread_mutex_unlock (&mutex) != 0) - ret = 1; + TEST_COMPARE (pthread_mutex_unlock (&mutex), 0); return ret; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include <support/test-driver.c> |