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.
This commit is contained in:
Wainer dos Santos Moschetta 2017-02-21 10:16:49 -03:00 committed by Tulio Magno Quites Machado Filho
parent 0b38d66a4e
commit ee6df1e6ab
4 changed files with 19 additions and 21 deletions

View File

@ -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> 2017-02-20 Mike FABIAN <mfabian@redhat.com>
[BZ #20313] [BZ #20313]

View File

@ -23,6 +23,9 @@
#include <stdint.h> #include <stdint.h>
#include <pthread.h> #include <pthread.h>
#include <support/check.h>
#include <support/xthread.h>
#include <sys/auxv.h> #include <sys/auxv.h>
#include <dl-procinfo.h> #include <dl-procinfo.h>
@ -148,7 +151,6 @@ do_test (void)
pthread_attr_t attr; pthread_attr_t attr;
pthread_attr_init (&attr); pthread_attr_init (&attr);
pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE); pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_JOINABLE);
void *status;
long i = 0; long i = 0;
@ -160,22 +162,10 @@ do_test (void)
/* Check for other thread. */ /* Check for other thread. */
i++; i++;
if (pthread_create (&threads[i], &attr, t1, (void *)i)) threads[i] = xpthread_create (&attr, t1, (void *)i);
{
printf ("FAIL: error creating thread %ld.\n", i);
return 1;
}
pthread_attr_destroy (&attr); pthread_attr_destroy (&attr);
if (pthread_join (threads[i], &status)) TEST_VERIFY_EXIT (xpthread_join (threads[i]) == NULL);
{
printf ("FAIL: error joining thread %ld.\n", i);
return 1;
}
if (status)
{
return 1;
}
printf("PASS: HWCAP, HWCAP2 and AT_PLATFORM are correctly set in the TCB for" printf("PASS: HWCAP, HWCAP2 and AT_PLATFORM are correctly set in the TCB for"
" all threads.\n"); " all threads.\n");
@ -184,5 +174,4 @@ do_test (void)
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -43,5 +43,4 @@ do_test (void)
return 1; return 1;
} }
#define TEST_FUNCTION do_test () #include <support/test-driver.c>
#include "../test-skeleton.c"

View File

@ -8,7 +8,6 @@
COMMON_INT_DEF(foo); COMMON_INT_DEF(foo);
#define TEST_FUNCTION do_test ()
static int static int
do_test (void) do_test (void)
{ {
@ -49,4 +48,4 @@ do_test (void)
return result; return result;
} }
#include "../../test-skeleton.c" #include <support/test-driver.c>