2009-12-08 Joel Sherrill <joel.sherrill@oarcorp.com>

	* 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.

1 files changed, 10 insertions, 4 deletions

diff --git a/testsuites/psxtests/include/pmacros.h b/testsuites/psxtests/include/pmacros.h
index ceb2906214..be9f35c8e5 100644
--- a/testsuites/psxtests/include/pmacros.h
+++ b/testsuites/psxtests/include/pmacros.h
@@ -1,4 +1,11 @@
 /*
+ *  COPYRIGHT (c) 1989-2009.
+ *  On-Line Applications Research Corporation (OAR).
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
  *  $Id$
  */
 
@@ -9,7 +16,6 @@
 #include <bsp.h>
 #endif
 #include <pthread.h>
-#include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
@@ -64,10 +70,10 @@
     \
     tv.tv_sec = mktime( &tm ); \
     tv.tv_nsec = 0; \
-    assert( tv.tv_sec != -1 ); \
+    rtems_test_assert(  tv.tv_sec != -1 ); \
     \
     status = clock_settime( CLOCK_REALTIME, &tv ); \
-    assert( !status ); \
+    rtems_test_assert(  !status ); \
   } while ( 0 )
 
 #define print_current_time(s1, s2) \
@@ -77,7 +83,7 @@
     struct timespec _tv; \
     \
     _status = clock_gettime( CLOCK_REALTIME, &_tv ); \
-    assert( !_status ); \
+    rtems_test_assert(  !_status ); \
     \
     (void) ctime_r( &_tv.tv_sec, _time_buffer ); \
     _time_buffer[ strlen( _time_buffer ) - 1 ] = 0; \