aboutsummaryrefslogtreecommitdiff
path: root/nptl/tst-sem13.c
diff options
context:
space:
mode:
authorMike Crowe <mcrowe@brightsign.biz>2019-03-25 09:28:18 -0300
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2019-03-25 10:36:43 -0300
commit7a773abf7c91f74fdc1866951e123e68713e88e1 (patch)
tree8ce86a544156f7622e0658de76040a43d0e36b66 /nptl/tst-sem13.c
parentd7563e6277ee9c0b6936debd4a6c9a910105b68a (diff)
downloadglibc-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-sem13.c')
-rw-r--r--nptl/tst-sem13.c47
1 files changed, 10 insertions, 37 deletions
diff --git a/nptl/tst-sem13.c b/nptl/tst-sem13.c
index 1560e91..28d37ed 100644
--- a/nptl/tst-sem13.c
+++ b/nptl/tst-sem13.c
@@ -4,6 +4,7 @@
#include <unistd.h>
#include <pthread.h>
#include <internaltypes.h>
+#include <support/check.h>
static int
@@ -15,61 +16,33 @@ do_test (void)
struct new_sem ns;
} u;
- if (sem_init (&u.s, 0, 0) != 0)
- {
- puts ("sem_init failed");
- return 1;
- }
+ TEST_COMPARE (sem_init (&u.s, 0, 0), 0);
struct timespec ts = { 0, 1000000001 }; /* Invalid. */
errno = 0;
- if (sem_timedwait (&u.s, &ts) >= 0)
- {
- puts ("sem_timedwait did not fail");
- return 1;
- }
- if (errno != EINVAL)
- {
- perror ("sem_timedwait did not fail with EINVAL");
- return 1;
- }
+ TEST_VERIFY_EXIT (sem_timedwait (&u.s, &ts) < 0);
+ TEST_COMPARE (errno, EINVAL);
+
#if __HAVE_64B_ATOMICS
unsigned int nwaiters = (u.ns.data >> SEM_NWAITERS_SHIFT);
#else
unsigned int nwaiters = u.ns.nwaiters;
#endif
- if (nwaiters != 0)
- {
- printf ("sem_timedwait modified nwaiters: %d\n", nwaiters);
- return 1;
- }
+ TEST_COMPARE (nwaiters, 0);
ts.tv_sec = /* Invalid. */ -2;
ts.tv_nsec = 0;
errno = 0;
- if (sem_timedwait (&u.s, &ts) >= 0)
- {
- puts ("2nd sem_timedwait did not fail");
- return 1;
- }
- if (errno != ETIMEDOUT)
- {
- perror ("2nd sem_timedwait did not fail with ETIMEDOUT");
- return 1;
- }
+ TEST_VERIFY_EXIT (sem_timedwait (&u.s, &ts) < 0);
+ TEST_COMPARE (errno, ETIMEDOUT);
#if __HAVE_64B_ATOMICS
nwaiters = (u.ns.data >> SEM_NWAITERS_SHIFT);
#else
nwaiters = u.ns.nwaiters;
#endif
- if (nwaiters != 0)
- {
- printf ("2nd sem_timedwait modified nwaiters: %d\n", nwaiters);
- return 1;
- }
+ TEST_COMPARE (nwaiters, 0);
return 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+#include <support/test-driver.c>