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, 12 insertions, 8 deletions

diff --git a/testsuites/psxtests/psxchroot01/test.c b/testsuites/psxtests/psxchroot01/test.c
index 19348508c3..61045f7ce6 100644
--- a/testsuites/psxtests/psxchroot01/test.c
+++ b/testsuites/psxtests/psxchroot01/test.c
@@ -15,7 +15,12 @@
  *  implementation of this appears to seek to the ((off/DIRENT_SIZE) + 1)
  *  record where DIRENT_SIZE seems to be 12 bytes.
  *
+ *  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$
  */
@@ -24,7 +29,6 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <string.h>
-#include <assert.h>
 #include <unistd.h>
 #include <errno.h>
 #include <rtems/libio.h>
@@ -35,10 +39,10 @@ void touch( char *file )
 {
   int fd;
 
-  assert( file );
+  rtems_test_assert(  file );
 
   fd = open( file, O_RDWR|O_CREAT, 0777 );
-  assert( fd != -1 );
+  rtems_test_assert(  fd != -1 );
   close( fd );
 }
 
@@ -47,7 +51,7 @@ int fileexists( char *file )
   int         status;
   struct stat statbuf;
 
-  assert( file );
+  rtems_test_assert(  file );
 
   status = stat( file, &statbuf );
 
@@ -86,19 +90,19 @@ int main(
   printf( "\n\n*** CHROOT01 TEST ***\n" );
 
   status = mkdir( "/one", 0777);
-  assert( status == 0 );
+  rtems_test_assert(  status == 0 );
 
   status = mkdir( "/one/one", 0777);
-  assert( status == 0 );
+  rtems_test_assert(  status == 0 );
 
   status = mkdir( "/one/two", 0777);
-  assert( status == 0 );
+  rtems_test_assert(  status == 0 );
 
   touch( "/one/one.test" );
   touch( "/one/two/two.test" );
 
   status = chroot( "/one" );
-  assert( status == 0 );
+  rtems_test_assert(  status == 0 );
 
   status = fileexists( "/one/one.test" );
   printf( "%s on /one/one.test\n", (!status) ? "SUCCESS" : "FAILURE" );