diff options
| author | Maciej W. Rozycki <macro@redhat.com> | 2024-07-11 14:17:20 +0100 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2024-07-12 20:41:08 +0200 |
| commit | 4b2a1b602fc1ade0de85084feb328203be3147c9 (patch) | |
| tree | daa57ae8d13601adf407ba68a7a52fd25525abba | |
| parent | 9d8995833e463cd675cc8bd40036d7d1412fdd1b (diff) | |
| download | glibc-4b2a1b602fc1ade0de85084feb328203be3147c9.zip glibc-4b2a1b602fc1ade0de85084feb328203be3147c9.tar.gz glibc-4b2a1b602fc1ade0de85084feb328203be3147c9.tar.bz2 | |
nptl: Convert tst-sem11 and tst-sem12 tests to use the test driver
Fix an issue with commit 2af4e3e5668f ("Test of semaphores.") by making
the tst-sem11 and tst-sem12 tests use the test driver, preventing them
from ever causing testing to hang forever and never complete, such as
currently happening with the 'mips-linux-gnu' (o32 ABI) target. Adjust
the name of the PREPARE macro, which clashes with the interpretation of
its presence by the test driver, by using a TF_ prefix in reference to
the name of the 'tf' function.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | nptl/tst-sem11.c | 8 | ||||
| -rw-r--r-- | nptl/tst-sem12.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nptl/tst-sem11.c b/nptl/tst-sem11.c index 891e37a..a82bb73 100644 --- a/nptl/tst-sem11.c +++ b/nptl/tst-sem11.c @@ -29,15 +29,15 @@ static void * tf (void *arg) { -#ifdef PREPARE - PREPARE +#ifdef TF_PREPARE + TF_PREPARE #endif SEM_WAIT (arg); return NULL; } int -main (void) +do_test (void) { int tries = 5; pthread_t th; @@ -101,3 +101,5 @@ main (void) return 0; } + +#include <support/test-driver.c> diff --git a/nptl/tst-sem12.c b/nptl/tst-sem12.c index a984352..d4e22d9 100644 --- a/nptl/tst-sem12.c +++ b/nptl/tst-sem12.c @@ -20,7 +20,7 @@ #include <sys/time.h> -#define PREPARE \ +#define TF_PREPARE \ struct timespec ts; \ struct timeval tv; \ gettimeofday (&tv, NULL); \ |