From 2317457e101509ca16a669d99719ae44b0c60599 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:53 +0000 Subject: 2009-12-08 Joel Sherrill * include/pmacros.h, psx01/task.c, psx02/init.c, psx02/task.c, psx03/init.c, psx03/task.c, psx04/init.c, psx04/task1.c, psx04/task2.c, psx04/task3.c, psx05/init.c, psx05/task.c, psx05/task2.c, psx05/task3.c, psx06/init.c, psx06/task.c, psx06/task2.c, psx07/init.c, psx08/init.c, psx08/task2.c, psx08/task3.c, psx09/init.c, psx10/init.c, psx10/task.c, psx10/task2.c, psx10/task3.c, psx11/init.c, psx11/task.c, psx12/init.c, psxalarm01/init.c, psxbarrier01/test.c, psxcancel01/init.c, psxchroot01/test.c, psxclock/init.c, psxfile01/test.c, psxfile01/test_cat.c, psxfile01/test_extend.c, psxfile01/test_write.c, psxitimer/init.c, psxkey01/task.c, psxkey02/init.c, psxkey03/init.c, psxmount/test.c, psxmsgq01/init.c, psxmsgq03/init.c, psxmsgq04/init.c, psxreaddir/test.c, psxrwlock01/test.c, psxsem01/init.c, psxsignal01/init.c, psxsignal01/task1.c, psxsignal02/init.c, psxsignal03/init.c, psxsignal05/init.c, psxspin01/test.c, psxspin02/test.c, psxstack01/init.c, psxstat/test.c, psxtime/test.c, psxualarm/init.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/psxtests/psxbarrier01/test.c | 79 ++++++++++++++++----------------- 1 file changed, 39 insertions(+), 40 deletions(-) (limited to 'testsuites/psxtests/psxbarrier01') diff --git a/testsuites/psxtests/psxbarrier01/test.c b/testsuites/psxtests/psxbarrier01/test.c index b128c27484..b359cdf32d 100644 --- a/testsuites/psxtests/psxbarrier01/test.c +++ b/testsuites/psxtests/psxbarrier01/test.c @@ -11,7 +11,6 @@ * $Id$ */ -#include #include #include #include @@ -34,7 +33,7 @@ void *BarrierThread(void *arg) printf( "pthread_barrier_wait( &Barrier ) for thread 0x%08" PRIxpthread_t "\n", id ); status = pthread_barrier_wait( &Barrier ); printf( "pthread_barrier_wait - 0x%08" PRIxpthread_t " released\n", id ); - assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); + rtems_test_assert( (status == 0) || (status == PTHREAD_BARRIER_SERIAL_THREAD) ); return NULL; } @@ -66,155 +65,155 @@ int main( /*************** NULL POINTER CHECKS *****************/ puts( "pthread_barrierattr_init( NULL ) -- EINVAL" ); status = pthread_barrierattr_init( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, private ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_setpshared( NULL, shared ) -- EINVAL" ); status = pthread_barrierattr_setpshared( NULL, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( NULL, &p ) -- EINVAL" ); status = pthread_barrierattr_getpshared( NULL, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( NULL ) -- EINVAL" ); status = pthread_barrierattr_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** NOT INITIALIZED CHECKS *****************/ /* cheat visibility */ attr.is_initialized = 0; puts( "pthread_barrierattr_setpshared( &attr, shared ) -- EINVAL" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_getpshared( &attr, NULL ) -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrierattr_destroy( &attr ) -- EINVAL" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY WORK THIS TIME *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_setpshared( &attr, private ) -- OK" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_PRIVATE ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_PRIVATE ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_PRIVATE ); puts( "pthread_barrierattr_setpshared( &attr, shared ) -- OK" ); status = pthread_barrierattr_setpshared( &attr, PTHREAD_PROCESS_SHARED ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) -- OK" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == 0 ); - assert( p == PTHREAD_PROCESS_SHARED ); + rtems_test_assert( status == 0 ); + rtems_test_assert( p == PTHREAD_PROCESS_SHARED ); /*************** BAD PSHARED CHECK *****************/ puts( "pthread_barrierattr_setpshared( &attr, private ) -- EINVAL" ); status = pthread_barrierattr_setpshared( &attr, ~PTHREAD_PROCESS_PRIVATE ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** DESTROY/REUSE CHECK *****************/ puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_getpshared( &attr, &p ) destroyed -- EINVAL" ); status = pthread_barrierattr_getpshared( &attr, &p ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** pthread_barrier_init ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_init( NULL, NULL, 2 ) -- EINVAL" ); status = pthread_barrier_init( NULL, NULL, 2 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* uninitialized attr argument */ puts( "pthread_barrier_init( &barrier, &attr, 2 ) -- EINVAL" ); status = pthread_barrier_init( &barrier, &attr, 2 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* zero count argument */ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 0 ) -- EINVAL" ); status = pthread_barrier_init( &barrier, &attr, 0 ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /* allocating too many */ puts( "pthread_barrier_init( &barrier, NULL, 1 ) -- OK" ); status = pthread_barrier_init( &barrier, NULL, 1 ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, NULL, 1 ) -- EAGAIN" ); status = pthread_barrier_init( &barrier, NULL, 1 ); - assert( status == EAGAIN ); + rtems_test_assert( status == EAGAIN ); /* clean up */ puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrierattr_destroy( &attr ) -- OK" ); status = pthread_barrierattr_destroy( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** pthread_barrier_destroy ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_destroy( NULL ) -- EINVAL" ); status = pthread_barrier_destroy( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_destroy( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_destroy( &bad_barrier ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** pthread_barrier_wait ERROR CHECKs *********/ /* NULL barrier argument */ puts( "pthread_barrier_wait( NULL ) -- EINVAL" ); status = pthread_barrier_wait( NULL ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); puts( "pthread_barrier_wait( &bad_barrier ) -- EINVAL" ); status = pthread_barrier_wait( &bad_barrier ); - assert( status == EINVAL ); + rtems_test_assert( status == EINVAL ); /*************** ACTUALLY CREATE ONE CHECK *****************/ puts( "pthread_barrierattr_init( &attr ) -- OK" ); status = pthread_barrierattr_init( &attr ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); puts( "pthread_barrier_init( &barrier, &attr, 2 ) -- OK" ); status = pthread_barrier_init( &barrier, &attr, 2 ); - assert( status == 0 ); - assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); puts( "pthread_barrier_destroy( &barrier ) -- OK" ); status = pthread_barrier_destroy( &barrier ); - assert( status == 0 ); + rtems_test_assert( status == 0 ); /*************** CREATE THREADS AND LET THEM RELEASE *****************/ puts( "pthread_barrier_init( &Barrier, &attr, NUMBER_THREADS ) -- OK" ); status = pthread_barrier_init( &Barrier, &attr, NUMBER_THREADS ); - assert( status == 0 ); - assert( barrier != 0 ); + rtems_test_assert( status == 0 ); + rtems_test_assert( barrier != 0 ); for (i=0 ; i