diff options
author | Mike Crowe <mcrowe@brightsign.biz> | 2019-03-25 09:28:18 -0300 |
---|---|---|
committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-03-25 10:36:43 -0300 |
commit | 7a773abf7c91f74fdc1866951e123e68713e88e1 (patch) | |
tree | 8ce86a544156f7622e0658de76040a43d0e36b66 /nptl/tst-sem5.c | |
parent | d7563e6277ee9c0b6936debd4a6c9a910105b68a (diff) | |
download | glibc-7a773abf7c91f74fdc1866951e123e68713e88e1.zip glibc-7a773abf7c91f74fdc1866951e123e68713e88e1.tar.gz glibc-7a773abf7c91f74fdc1866951e123e68713e88e1.tar.bz2 |
nptl: Convert tst-sem5 & tst-sem13 to use libsupport
Checked on x86_64-linux-gnu and i686-linux-gnu.
* nptl/tst-sem5.c: Remove unused headers. Add <support/check.h>.
(do_test) Use libsupport test macros rather than hand-coded
conditionals and error messages. Ensure that sem_init returns zero
rather than not -1. Use <support/test-driver.c> rather than
test-skeleton.c.
* nptl/tst-sem13.c: Add <support/check.h>. (do_test) Use libsupport
test macros rather than hand-coded conditionals and error messages.
Use <support/test-driver.c> rather than test-skeleton.c.
Diffstat (limited to 'nptl/tst-sem5.c')
-rw-r--r-- | nptl/tst-sem5.c | 52 |
1 files changed, 10 insertions, 42 deletions
diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c index 2149ade..50ab6f9 100644 --- a/nptl/tst-sem5.c +++ b/nptl/tst-sem5.c @@ -18,10 +18,10 @@ #include <errno.h> #include <semaphore.h> -#include <stdio.h> #include <time.h> #include <unistd.h> #include <sys/time.h> +#include <support/check.h> static int @@ -31,23 +31,9 @@ do_test (void) struct timespec ts; struct timeval tv; - if (sem_init (&s, 0, 1) == -1) - { - puts ("sem_init failed"); - return 1; - } - - if (TEMP_FAILURE_RETRY (sem_wait (&s)) == -1) - { - puts ("sem_wait failed"); - return 1; - } - - if (gettimeofday (&tv, NULL) != 0) - { - puts ("gettimeofday failed"); - return 1; - } + TEST_COMPARE (sem_init (&s, 0, 1), 0); + TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0); + TEST_COMPARE (gettimeofday (&tv, NULL), 0); TIMEVAL_TO_TIMESPEC (&tv, &ts); @@ -60,34 +46,16 @@ do_test (void) } errno = 0; - if (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)) != -1) - { - puts ("sem_timedwait succeeded"); - return 1; - } - if (errno != ETIMEDOUT) - { - printf ("sem_timedwait return errno = %d instead of ETIMEDOUT\n", - errno); - return 1; - } + TEST_COMPARE (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)), -1); + TEST_COMPARE (errno, ETIMEDOUT); struct timespec ts2; - if (clock_gettime (CLOCK_REALTIME, &ts2) != 0) - { - puts ("clock_gettime failed"); - return 1; - } + TEST_COMPARE (clock_gettime (CLOCK_REALTIME, &ts2), 0); - if (ts2.tv_sec < ts.tv_sec - || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec < ts.tv_nsec)) - { - puts ("timeout too short"); - return 1; - } + TEST_VERIFY (ts2.tv_sec > ts.tv_sec + || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec > ts.tv_nsec)); return 0; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include <support/test-driver.c> |