2007-10-18 Glenn Humphrey <glenn.humphrey@OARcorp.com>

	* sp09/screen06.c, sp09/screen14.c, sp13/sp13.scn, sp13/task1.c,
	sp16/sp16.scn: Corrected some minor mistakes and regenerated some
	.scn files.

2 files changed, 15 insertions, 13 deletions

diff --git a/testsuites/sptests/sp13/sp13.scn b/testsuites/sptests/sp13/sp13.scn
index 51441e1c15..dade11fde2 100644
--- a/testsuites/sptests/sp13/sp13.scn
+++ b/testsuites/sptests/sp13/sp13.scn
@@ -1,5 +1,5 @@
 *** TEST 13 ***
-TA1 - rtems_message_queue_ident - qid => 1c010001
+TA1 - rtems_message_queue_ident - qid => 22010001
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 1
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 1
 TA1 - rtems_task_wake_after - sleep 5 seconds
@@ -52,15 +52,15 @@ TA1 - buffer received: BUFFER 3 TO Q 2
 TA1 - rtems_message_queue_delete - delete queue 1
 TA1 - rtems_message_queue_urgent - BUFFER 3 TO Q 2
 TA1 - rtems_message_queue_delete - delete queue 2
-TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL
+TA1 - rtems_message_queue_get_number_pending - check Q 3
 TA1 - 0 messages are pending on Q 3
 TA1 - rtems_message_queue_flush - empty Q 3
 TA1 - 0 messages were flushed from Q 3
 TA1 - rtems_message_queue_send - BUFFER 1 TO Q 3
 TA1 - rtems_message_queue_send - BUFFER 2 TO Q 3
-TA3 - rtems_message_queue_broadcast - NO BUFFER TO Q1
-TA3 - number of tasks awakened = 0
-TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL
+TA1 - rtems_message_queue_broadcast - NO BUFFER TO Q1
+TA1 - number of tasks awakened = 0
+TA1 - rtems_message_queue_get_number_pending - check Q 3
 TA1 - 2 messages are pending on Q 3
 TA1 - rtems_message_queue_send - BUFFER 3 TO Q 3
 TA1 - rtems_message_queue_flush - Q 3
@@ -69,10 +69,10 @@ TA1 - rtems_message_queue_send until all message buffers consumed
 TA1 - all message buffers consumed
 TA1 - rtems_message_queue_flush - Q 3
 TA1 - 100 messages were flushed from Q 3
-<pause> 
+<pause>
 TA1 - create message queue of 20 bytes on queue 1
 TA1 - rtems_message_queue_delete - delete queue 1
-<pause> 
+<pause>
 TA1 - rtems_message_queue_create - variable sizes 
 TA1 - rtems_message_queue_create and send - variable sizes 
 *** END OF TEST 13 ***
diff --git a/testsuites/sptests/sp13/task1.c b/testsuites/sptests/sp13/task1.c
index d73dafa001..57f1cf4725 100644
--- a/testsuites/sptests/sp13/task1.c
+++ b/testsuites/sptests/sp13/task1.c
@@ -195,12 +195,14 @@ rtems_test_pause();
   status = rtems_message_queue_delete( Queue_id[ 2 ] );
   directive_failed( status, "rtems_message_queue_delete" );
 
-  puts( "TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL\n" );
+  puts( "TA1 - rtems_message_queue_get_number_pending - check Q 3" );
   status = rtems_message_queue_get_number_pending( Queue_id[ 3 ], &count );
+  directive_failed( status, "rtems_message_queue_get_number_pending" );
   printf( "TA1 - %d messages are pending on Q 3\n", count );
 
   puts( "TA1 - rtems_message_queue_flush - empty Q 3" );
   status = rtems_message_queue_flush( Queue_id[ 3 ], &count );
+  directive_failed( status, "rtems_message_queue_flush" );
   printf( "TA1 - %d messages were flushed from Q 3\n", count );
 
   Fill_buffer( "BUFFER 1 TO Q 3", buffer );
@@ -215,18 +217,18 @@ rtems_test_pause();
 
   /* this broadcast should have no effect on the queue */
   Fill_buffer( "NO BUFFER TO Q1", (long *)buffer );
-  puts( "TA3 - rtems_message_queue_broadcast - NO BUFFER TO Q1" );
+  puts( "TA1 - rtems_message_queue_broadcast - NO BUFFER TO Q1" );
   status = rtems_message_queue_broadcast(
     Queue_id[ 1 ],
     (long (*)[4])buffer,
     16,
     &count
   );
-  printf( "TA3 - number of tasks awakened = %d\n", count );
+  printf( "TA1 - number of tasks awakened = %d\n", count );
 
-
-  puts( "TA1 - rtems_message_queue_get_number_pending - SUCCESSFUL\n" );
+  puts( "TA1 - rtems_message_queue_get_number_pending - check Q 3" );
   status = rtems_message_queue_get_number_pending( Queue_id[ 3 ], &count );
+  directive_failed( status, "rtems_message_queue_get_number_pending" );
   printf( "TA1 - %d messages are pending on Q 3\n", count );
 
   Fill_buffer( "BUFFER 3 TO Q 3", buffer );
@@ -261,7 +263,7 @@ rtems_test_pause();
     &Queue_id[ 1 ]
   );
   directive_failed( status, "rtems_message_queue_create of Q1; 20 bytes each" );
-  status = rtems_message_queue_send( Queue_id[ 3 ], big_send_buffer, 40 );
+  status = rtems_message_queue_send( Queue_id[ 1 ], big_send_buffer, 40 );
   fatal_directive_status(status, RTEMS_INVALID_SIZE, "expected RTEMS_INVALID_SIZE");
 
   puts( "TA1 - rtems_message_queue_delete - delete queue 1" );