2002-08-01 Joel Sherrill <joel@OARcorp.com>

	* Per PR47 add support for buffered test output.  This involved
	adding defines to redirect output to a buffer and dump it when
	full, at "test pause", and at exit.  To avoid problems when redefining
	exit(), all tests were modified to call rtems_test_exit().
	Some tests, notable psxtests, had to be modified to include
	the standard test macro .h file (pmacros.h or tmacros.h) to
	enable this support.
	* include/pmacros.h, psx01/task.c, psx02/init.c, psx02/task.c,
	psx03/init.c, psx04/init.c, psx05/init.c, psx06/init.c, psx07/init.c,
	psx08/task3.c, psx09/init.c, psx10/init.c, psx11/init.c,
	psx12/init.c, psx13/Makefile.am, psx13/main.c, psx13/test.c,
	psxcancel/init.c, psxchroot01/Makefile.am, psxchroot01/main.c,
	psxchroot01/test.c, psxfile01/Makefile.am, psxfile01/main.c,
	psxfile01/test.c, psxfile01/test_cat.c, psxfile01/test_extend.c,
	psxfile01/test_write.c, psxmount/Makefile.am, psxmount/main.c,
	psxmount/test.c, psxmsgq01/init.c, psxreaddir/Makefile.am,
	psxreaddir/main.c, psxreaddir/test.c, psxsem01/init.c,
	psxstat/Makefile.am, psxstat/main.c, psxstat/test.c, psxtime/main.c,
	psxtime/test.c, psxtimer/psxtimer.c: Modified.

6 files changed, 18 insertions, 9 deletions

diff --git a/testsuites/psxtests/psxfile01/Makefile.am b/testsuites/psxtests/psxfile01/Makefile.am
index b3327d2bde..6c17d6f002 100644
--- a/testsuites/psxtests/psxfile01/Makefile.am
+++ b/testsuites/psxtests/psxfile01/Makefile.am
@@ -29,6 +29,8 @@ include $(top_srcdir)/psxtests.am
 # (OPTIONAL) Add local stuff here using +=
 #
 
+AM_CPPFLAGS += -I$(top_srcdir)/include
+
 ${PGM}: $(OBJS) $(LINK_FILES)
 	$(make-exe)
 
diff --git a/testsuites/psxtests/psxfile01/main.c b/testsuites/psxtests/psxfile01/main.c
index 36175c90a5..6590cc2f24 100644
--- a/testsuites/psxtests/psxfile01/main.c
+++ b/testsuites/psxtests/psxfile01/main.c
@@ -14,6 +14,7 @@
 #define TEST_INIT
 
 #include <bsp.h>
+#include <pmacros.h>
 
 void test_main( void );
 
@@ -22,7 +23,7 @@ rtems_task Init(
 )
 {
   test_main();
-  exit( 0 );
+  rtems_test_exit( 0 );
 }
 
 /* configuration information */
diff --git a/testsuites/psxtests/psxfile01/test.c b/testsuites/psxtests/psxfile01/test.c
index 4f42e32a38..eb23ff5667 100644
--- a/testsuites/psxtests/psxfile01/test.c
+++ b/testsuites/psxtests/psxfile01/test.c
@@ -503,7 +503,7 @@ int main(
   test_case_reopen_append();
 
   printf( "*** END OF FILE TEST 1 ***\n" );
-  exit( 0 );
+  rtems_test_exit( 0 );
 }
 
 /*
diff --git a/testsuites/psxtests/psxfile01/test_cat.c b/testsuites/psxtests/psxfile01/test_cat.c
index f6daecfad7..ea1e63ef7e 100644
--- a/testsuites/psxtests/psxfile01/test_cat.c
+++ b/testsuites/psxtests/psxfile01/test_cat.c
@@ -17,6 +17,8 @@
 
 #include <assert.h>
 
+#include <pmacros.h>
+
 /*
  *  test_cat routine
  */
@@ -44,7 +46,7 @@ void test_cat(
   fd = open( file, O_RDONLY );
   if ( fd == -1 ) {
     printf( "test_cat: open( %s ) failed : %s\n", file, strerror( errno ) );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   for ( ;; ) {
diff --git a/testsuites/psxtests/psxfile01/test_extend.c b/testsuites/psxtests/psxfile01/test_extend.c
index ae284aab46..3ab66c1410 100644
--- a/testsuites/psxtests/psxfile01/test_extend.c
+++ b/testsuites/psxtests/psxfile01/test_extend.c
@@ -21,6 +21,8 @@
 
 #include <assert.h>
 
+#include <pmacros.h>
+
 /*
  *  test_extend routine
  */
@@ -37,7 +39,7 @@ void test_extend(
   fd = open( file, O_WRONLY );
   if ( fd == -1 ) {
     printf( "test_extend: open( %s ) failed : %s\n", file, strerror( errno ) );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   status = lseek( fd, offset - 1, SEEK_SET );
@@ -46,13 +48,13 @@ void test_extend(
   status = write( fd, &c, 1 );
   if ( status == -1 ) {
     printf( "test_extend: write( %s ) failed : %s\n", file, strerror( errno ) );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   if ( status != 1 ) {
     printf( "test_extend: write( %s ) only wrote %d of %d bytes\n",
             file, status, 1 );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   status = close( fd );
diff --git a/testsuites/psxtests/psxfile01/test_write.c b/testsuites/psxtests/psxfile01/test_write.c
index c025734532..b87ba06624 100644
--- a/testsuites/psxtests/psxfile01/test_write.c
+++ b/testsuites/psxtests/psxfile01/test_write.c
@@ -16,6 +16,8 @@
 
 #include <assert.h>
 
+#include <pmacros.h>
+
 /*
  *  test_write routine
  */
@@ -36,7 +38,7 @@ void test_write(
   fd = open( file, O_WRONLY );
   if ( fd == -1 ) {
     printf( "test_write: open( %s ) failed : %s\n", file, strerror( errno ) );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   status = lseek( fd, offset, SEEK_SET );
@@ -45,13 +47,13 @@ void test_write(
   status = write( fd, buffer, length );
   if ( status == -1 ) {
     printf( "test_write: write( %s ) failed : %s\n", file, strerror( errno ) );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   if ( status != length ) {
     printf( "test_write: write( %s ) only wrote %d of %d bytes\n",
             file, status, length );
-    exit( 0 );
+    rtems_test_exit( 0 );
   }
 
   status = close( fd );