2011-07-29 Jennifer Averett <Jennifer.Averett@OARcorp.com>

	* smp01/init.c, smp02/init.c, smp02/tasks.c, smp03/init.c,
	smp03/tasks.c, smp04/Makefile.am, smp04/init.c, smp05/init.c,
	smp06/init.c, smp07/init.c, smp08/init.c: Cleaned up tests and fixed
	some print statement problems.
	* smp04/tasks.c: Removed.

2 files changed, 8 insertions, 7 deletions

diff --git a/testsuites/smptests/smp03/init.c b/testsuites/smptests/smp03/init.c
index 060371b9d5..3ea0330a06 100644
--- a/testsuites/smptests/smp03/init.c
+++ b/testsuites/smptests/smp03/init.c
@@ -29,7 +29,6 @@ void PrintTaskInfo(
 )
 {
   int               cpu_num;
-  rtems_status_code sc;
 
   cpu_num = bsp_smp_processor_id();
 
@@ -41,21 +40,21 @@ rtems_task Init(
 )
 {
   int               i;
-  char              ch;
+  char              ch = '0';
   rtems_id          id;
   rtems_status_code status;
 
   Loop();
   locked_print_initialize();
 
-  locked_printf( "\n\n***  SMP03 TEST ***" );
+  locked_printf( "\n\n***  SMP03 TEST ***\n" );
 
 
   /* Show that the init task is running on this cpu */
   PrintTaskInfo( "Init" );
 
   /* for each remaining cpu create and start a task */
-  for ( i=1; i < CONFIGURE_SMP_MAXIMUM_PROCESSORS; i++ ){
+  for ( i=1; i < rtems_smp_get_number_of_processors(); i++ ){
 
     ch = '0' + i;
 
@@ -82,13 +81,15 @@ rtems_task Init(
     &id
   );
   TestFinished = false;
-  status = rtems_task_start( id, Test_task, CONFIGURE_SMP_MAXIMUM_PROCESSORS );
+  status = rtems_task_start(id,Test_task,rtems_smp_get_number_of_processors());
 
   /* Wait on the last task to run */
   while(!TestFinished)
     ;
 
   /* End the test */
-  locked_printf( "*** END OF TEST SMP03 ***" );
+  Loop();
+  locked_printf( "*** END OF TEST SMP03 ***\n" );
+  Loop();
   rtems_test_exit( 0 );    
 }
diff --git a/testsuites/smptests/smp03/tasks.c b/testsuites/smptests/smp03/tasks.c
index d609596d3f..16660a0b23 100644
--- a/testsuites/smptests/smp03/tasks.c
+++ b/testsuites/smptests/smp03/tasks.c
@@ -28,7 +28,7 @@ rtems_task Test_task(
   /* If this is the last task created set a flag for the
    * test to end.
    */
-  if ( task_index  == CONFIGURE_SMP_MAXIMUM_PROCESSORS ) {
+  if ( task_index  == rtems_smp_get_number_of_processors() ) {
     TestFinished = true;
   }