From cd9396e7d084473bee312f6e1cda13174247e0cc Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Fri, 2 Aug 2002 00:51:52 +0000
Subject: 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/buffer_test_io.h: New file.
---
 testsuites/support/include/tmacros.h | 38 +++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'testsuites/support/include/tmacros.h')

diff --git a/testsuites/support/include/tmacros.h b/testsuites/support/include/tmacros.h
index cfa8684057..a49068f8b6 100644
--- a/testsuites/support/include/tmacros.h
+++ b/testsuites/support/include/tmacros.h
@@ -37,14 +37,21 @@ extern "C" {
 #define TEST_EXTERN extern
 #endif
 
+#include <buffer_test_io.h>
+
+/*
+ *  Check that that the dispatch disable level is proper for the
+ *  mode/state of the test.  Normally it should be 0 when in task space.
+ */
+
 #define check_dispatch_disable_level( _expect ) \
   do { \
     extern volatile rtems_unsigned32 _Thread_Dispatch_disable_level; \
     if ( (_expect) != -1 && _Thread_Dispatch_disable_level != (_expect) ) { \
       printf( "\n_Thread_Dispatch_disable_level is (%d) not %d\n", \
               _Thread_Dispatch_disable_level, (_expect) ); \
-      fflush(stdout); \
-      exit( 1 ); \
+      FLUSH_OUTPUT(); \
+      rtems_test_exit( 1 ); \
     } \
   } while ( 0 ) 
 
@@ -67,8 +74,8 @@ extern "C" {
     if ( (_stat) != (_desired) ) { \
       printf( "\n%s FAILED -- expected (%s) got (%s)\n", \
               (_msg), rtems_status_text(_desired), rtems_status_text(_stat) ); \
-      fflush(stdout); \
-      exit( _stat ); \
+      FLUSH_OUTPUT(); \
+      rtems_test_exit( _stat ); \
     } \
   } while ( 0 )
 
@@ -100,8 +107,8 @@ extern "C" {
               (_msg), _desired, strerror(_desired), _stat, strerror(_stat) ); \
       printf( "\n FAILED -- errno (%d - %s)\n", \
               errno, strerror(errno) ); \
-      fflush(stdout); \
-      exit( _stat ); \
+      FLUSH_OUTPUT(); \
+      rtems_test_exit( _stat ); \
     } \
   } while ( 0 )
 
@@ -125,8 +132,8 @@ extern "C" {
     if ( (_stat) != (_desired) ) { \
       printf( "\n%s FAILED -- expected (%d) got (%d)\n", \
               (_msg), (_desired), (_stat) ); \
-      fflush(stdout); \
-      exit( _stat ); \
+      FLUSH_OUTPUT(); \
+      rtems_test_exit( _stat ); \
     } \
   } while ( 0 )
 
@@ -147,13 +154,12 @@ extern "C" {
     printf( "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
        _s1, (_tb)->hour, (_tb)->minute, (_tb)->second, \
        (_tb)->month, (_tb)->day, (_tb)->year, _s2 ); \
-    fflush(stdout); \
   } while ( 0 )
 
 #define put_dot( _c ) \
   do { \
     putchar( _c ); \
-    fflush( stdout ); \
+    FLUSH_OUTPUT(); \
   } while ( 0 )
 
 #define new_line  puts( "" )
@@ -163,18 +169,21 @@ extern "C" {
 #ifdef RTEMS_TEST_NO_PAUSE
 #define rtems_test_pause() \
     do { \
-      printf( "<pause>\n" ); fflush( stdout ); \
+      printf( "<pause>\n" ); \
+      FLUSH_OUTPUT(); \
   } while ( 0 )
 
 #define rtems_test_pause_and_screen_number( _screen ) \
   do { \
-    printf( "<pause - screen %d>\n", (_screen) ); fflush( stdout ); \
+    printf( "<pause - screen %d>\n", (_screen) ); \
+    FLUSH_OUTPUT(); \
   } while ( 0 )
 #else
 #define rtems_test_pause() \
   do { \
     char buffer[ 80 ]; \
-    printf( "<pause>" ); fflush( stdout ); \
+    printf( "<pause>" ); \
+    FLUSH_OUTPUT(); \
     gets( buffer ); \
     puts( "" ); \
   } while ( 0 )
@@ -182,7 +191,8 @@ extern "C" {
 #define rtems_test_pause_and_screen_number( _screen ) \
   do { \
     char buffer[ 80 ]; \
-    printf( "<pause - screen %d>", (_screen) ); fflush( stdout ); \
+    printf( "<pause - screen %d>", (_screen) ); \
+    FLUSH_OUTPUT(); \
     gets( buffer ); \
     puts( "" ); \
   } while ( 0 )
-- 
cgit v1.2.3