diff options
| author | Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> | 2017-02-21 10:16:49 -0300 |
|---|---|---|
| committer | Tulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com> | 2017-02-21 14:00:00 -0300 |
| commit | ee6df1e6ab5bf46ff0f71596e8ac46fcb2b790ef (patch) | |
| tree | e7374165850df509919b580f1ec7852815b1a9f5 | |
| parent | 0b38d66a4e2e0d7cb9f40da5bc6e795e20cf3088 (diff) | |
| download | glibc-ee6df1e6ab5bf46ff0f71596e8ac46fcb2b790ef.tar.gz glibc-ee6df1e6ab5bf46ff0f71596e8ac46fcb2b790ef.tar.xz glibc-ee6df1e6ab5bf46ff0f71596e8ac46fcb2b790ef.zip | |
powerpc: Convert tests to the new support test-driver
Change the powerpc tests to use <support/test-driver.c>. Also replace some of pthread calls to its xpthread equivalent. Tested on ppc64le. * sysdeps/powerpc/test-get_hwcap.c: Use <support/test-driver.c> instead of test-skeleton.c. (do_test): Replaced pthread_create and pthread_join with xpthread_create and xpthread_join. Use TEST_VERIFY_EXIT macro. Removed unneeded status variable. * sysdeps/powerpc/test-gettimebase.c: Use <support/test-driver.c> instead of test-skeleton.c. * sysdeps/powerpc/tst-tlsopt-powerpc.c: Likewise.
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/powerpc/test-get_hwcap.c | 23 | ||||
| -rw-r--r-- | sysdeps/powerpc/test-gettimebase.c | 3 | ||||
| -rw-r--r-- | sysdeps/powerpc/tst-tlsopt-powerpc.c | 3 |
4 files changed, 19 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index cfc9ff48ee..be4291b4e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2017-02-21 Wainer dos Santos Moschetta <wainersm@linux.vnet.ibm.com> + + * sysdeps/powerpc/test-get_hwcap.c: Use <support/test-driver.c> + instead of test-skeleton.c. + (do_test): Replaced pthread_create and pthread_join with + xpthread_create and xpthread_join. Use TEST_VERIFY_EXIT macro. + Removed unneeded status variable. + * sysdeps/powerpc/test-gettimebase.c: Use <support/test-driver.c> + instead of test-skeleton.c. + * sysdeps/powerpc/tst-tlsopt-powerpc.c: Likewise. + 2017-02-20 Mike FABIAN <mfabian@redhat.com> [BZ #20313] diff --git a/sysdeps/powerpc/test-get_hwcap.c b/sysdeps/powerpc/test-get_hwcap.c index f32ad639e6..d776310734 100644 --- a/sysdeps/powerpc/test-get_hwcap.c +++ b/sysdeps/powerpc/test-get_hwcap.c @@ -23,6 +23,9 @@ #include <stdint.h> #include <pthread.h> +#include <support/check.h> +#include <support/xthread.h> + #include <sys/auxv.h> #include <dl-procinfo.h> @@ -148,7 +151,6 @@ do_test (void) pthread_attr_t attr; pthread_attr_init (&attr); pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE); - void *status; long i = 0; @@ -160,22 +162,10 @@ do_test (void) /* Check for other thread. */ i++; - if (pthread_create (&threads[i], &attr, t1, (void *)i)) - { - printf ("FAIL: error creating thread %ld.\n", i); - return 1; - } + threads[i] = xpthread_create (&attr, t1, (void *)i); pthread_attr_destroy (&attr); - if (pthread_join (threads[i], &status)) - { - printf ("FAIL: error joining thread %ld.\n", i); - return 1; - } - if (status) - { - return 1; - } + TEST_VERIFY_EXIT (xpthread_join (threads[i]) == NULL); printf("PASS: HWCAP, HWCAP2 and AT_PLATFORM are correctly set in the TCB for" " all threads.\n"); @@ -184,5 +174,4 @@ do_test (void) } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include <support/test-driver.c> diff --git a/sysdeps/powerpc/test-gettimebase.c b/sysdeps/powerpc/test-gettimebase.c index 555f146a54..0e8e2f00fc 100644 --- a/sysdeps/powerpc/test-gettimebase.c +++ b/sysdeps/powerpc/test-gettimebase.c @@ -43,5 +43,4 @@ do_test (void) return 1; } -#define TEST_FUNCTION do_test () -#include "../test-skeleton.c" +#include <support/test-driver.c> diff --git a/sysdeps/powerpc/tst-tlsopt-powerpc.c b/sysdeps/powerpc/tst-tlsopt-powerpc.c index c9a14cbfdc..8ae928a3f4 100644 --- a/sysdeps/powerpc/tst-tlsopt-powerpc.c +++ b/sysdeps/powerpc/tst-tlsopt-powerpc.c @@ -8,7 +8,6 @@ COMMON_INT_DEF(foo); -#define TEST_FUNCTION do_test () static int do_test (void) { @@ -49,4 +48,4 @@ do_test (void) return result; } -#include "../../test-skeleton.c" +#include <support/test-driver.c> |