updates from Tony Bennett for PA and UNIX ports

4 files changed, 16 insertions, 11 deletions

diff --git a/c/src/tests/sptests/sp09/screen02.c b/c/src/tests/sptests/sp09/screen02.c
index 02eb5e4498..5f2ef82205 100644
--- a/c/src/tests/sptests/sp09/screen02.c
+++ b/c/src/tests/sptests/sp09/screen02.c
@@ -188,5 +188,5 @@ void Screen2()
     RTEMS_INVALID_CLOCK,
     "rtems_task_wake_when before current time"
   );
-  puts( " -  RTEMS_INVALID_CLOCK" );
+  puts( " - RTEMS_INVALID_CLOCK" );
 }
diff --git a/c/src/tests/sptests/sp11/sp11.scn b/c/src/tests/sptests/sp11/sp11.scn
index f34a9eac5f..db0469eb60 100644
--- a/c/src/tests/sptests/sp11/sp11.scn
+++ b/c/src/tests/sptests/sp11/sp11.scn
@@ -29,7 +29,7 @@ TA2 - rtems_task_delete - deletes self
 TA1 - RTEMS_EVENT_18 received - eventout => 00040000
 TA1 - rtems_clock_get - 08:15:05   02/12/1988
 TA1 - rtems_event_send - send RTEMS_EVENT_3 to self
-TA1 - rtems_event_receive - RTEMS_EVENT_3 or RTEMS_EVENT_22 - NO_WAIT and ANY 
+TA1 - rtems_event_receive - RTEMS_EVENT_3 or RTEMS_EVENT_22 - NO_WAIT and ANY
 TA1 - RTEMS_EVENT_3 received - eventout => 00000008
 TA1 - rtems_event_send - send RTEMS_EVENT_4 to self
 TA1 - rtems_event_receive - RTEMS_EVENT_4 or RTEMS_EVENT_5 - forever and ANY
@@ -63,10 +63,10 @@ TA1 - rtems_clock_set - 08:15:00   02/12/1988
 TA1 - rtems_event_receive all outstanding events
 TA1 - rtems_event_send - sending RTEMS_EVENT_10 to self in 1 day
 TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 2 days
-TA1 - rtems_clock_set - 07:15:00 02/12/1988
+TA1 - rtems_clock_set - 07:15:00   02/12/1988
 TA1 - set time backwards
 TA1 - no events received
-TA1 - rtems_clock_set - 07:15:00 02/14/1988
+TA1 - rtems_clock_set - 07:15:00   02/14/1988
 TA1 - set time forwards (leave a timer)
 TA1 - RTEMS_EVENT_10 received
 TA1 - rtems_event_send - sending RTEMS_EVENT_11 to self in 100 ticks
diff --git a/c/src/tests/support/include/tmacros.h b/c/src/tests/support/include/tmacros.h
index dc2a82f397..affc132edd 100644
--- a/c/src/tests/support/include/tmacros.h
+++ b/c/src/tests/support/include/tmacros.h
@@ -21,8 +21,7 @@
 extern "C" {
 #endif
 
-#include <rtems.h>
-#include <bsp.h>
+#include <bsp.h>    /* includes <rtems.h> */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,23 +39,29 @@ extern "C" {
     fatal_directive_status( dirstat, RTEMS_SUCCESSFUL, failmsg )
 
 #define fatal_directive_status( stat, desired, msg ) \
-     { \
+     do { \
        if ( (stat) != (desired) ) { \
          printf( "\n%s FAILED -- expected (%d) got (%d)\n", \
                  (msg), (desired), (stat) ); \
+         fflush(stdout); \
          exit( stat ); \
        } \
-     }
+     } while ( 0 ) 
 
 #define sprint_time(str,s1,tb,s2) \
+  do { \
     sprintf( (str), "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
        s1, (tb)->hour, (tb)->minute, (tb)->second, \
-       (tb)->month, (tb)->day, (tb)->year, s2 );
+       (tb)->month, (tb)->day, (tb)->year, s2 ); \
+  } while ( 0 )
 
 #define print_time(s1,tb,s2) \
+  do { \
     printf( "%s%02d:%02d:%02d   %02d/%02d/%04d%s", \
        s1, (tb)->hour, (tb)->minute, (tb)->second, \
-       (tb)->month, (tb)->day, (tb)->year, s2 );
+       (tb)->month, (tb)->day, (tb)->year, s2 ); \
+    fflush(stdout); \
+  } while ( 0 )
 
 #define put_dot( c ) putchar( c ); fflush( stdout )
 
diff --git a/c/src/tests/tools/generic/difftest b/c/src/tests/tools/generic/difftest
index 7c21155dbb..1f76cdf356 100644
--- a/c/src/tests/tools/generic/difftest
+++ b/c/src/tests/tools/generic/difftest
@@ -55,7 +55,7 @@ do
             fatal;;
     esac
 done
-((shiftcount = $OPTIND - 1))
+shiftcount=`expr $OPTIND - 1`
 shift $shiftcount
 
 args=$*