diff options
| -rw-r--r-- | testsuites/sptests/ChangeLog | 6 | ||||
| -rw-r--r-- | testsuites/sptests/sp09/screen06.c | 2 | ||||
| -rw-r--r-- | testsuites/sptests/sp09/screen14.c | 4 | ||||
| -rw-r--r-- | testsuites/sptests/sp13/sp13.scn | 14 | ||||
| -rw-r--r-- | testsuites/sptests/sp13/task1.c | 14 | ||||
| -rw-r--r-- | testsuites/sptests/sp16/sp16.scn | 52 |
6 files changed, 51 insertions, 41 deletions
diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 1a39b63e0a..6b59b6d81e 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,9 @@ +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. + 2007-10-10 Glenn Humphrey <glenn.humphrey@OARcorp.com> * sp09/init.c, sp09/sp09.scn: Removed an obsolete test that was diff --git a/testsuites/sptests/sp09/screen06.c b/testsuites/sptests/sp09/screen06.c index 08b51dcdf4..ba30d6710e 100644 --- a/testsuites/sptests/sp09/screen06.c +++ b/testsuites/sptests/sp09/screen06.c @@ -121,4 +121,6 @@ void Screen6() RTEMS_INVALID_ID, "rtems_task_delete after the task has been deleted" ); + + puts( "TA1 - rtems_task_delete TA2 - already deleted RTEMS_INVALID_ID" ); } diff --git a/testsuites/sptests/sp09/screen14.c b/testsuites/sptests/sp09/screen14.c index 7590108dee..d982a00984 100644 --- a/testsuites/sptests/sp09/screen14.c +++ b/testsuites/sptests/sp09/screen14.c @@ -135,7 +135,7 @@ void Screen14() ); status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); - directive_failed( status, "rtems_clock_set" ); + directive_failed( status, "rtems_clock_get" ); print_time( "TA1 - rtems_clock_get - ", &time, "\n" ); build_time( &time, 2, 5, 1990, 8, 30, 45, 0 ); @@ -227,7 +227,7 @@ void Screen14() ); status = rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time ); - directive_failed( status, "rtems_clock_set" ); + directive_failed( status, "rtems_clock_get" ); print_time( "TA1 - rtems_clock_get - ", &time, "\n" ); build_time( &time, 2, 5, 1990, 8, 30, 45, 0 ); 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" ); diff --git a/testsuites/sptests/sp16/sp16.scn b/testsuites/sptests/sp16/sp16.scn index 113d08f567..b5cd70a16f 100644 --- a/testsuites/sptests/sp16/sp16.scn +++ b/testsuites/sptests/sp16/sp16.scn @@ -1,58 +1,58 @@ *** TEST 16 *** -TA1 - rtems_region_ident - rnid => 32010002 +TA1 - rtems_region_ident - rnid => 32010001 TA1 - rtems_region_get_segment - wait on 100 byte segment from region 2 -TA1 - got segment from region 2 - 0x00000f78 +TA1 - got segment from region 2 - 0x00000060 TA1 - rtems_region_get_segment - wait on 3K segment from region 3 -TA1 - got segment from region 3 - 0x000003f8 +TA1 - got segment from region 3 - 0x00000030 TA1 - rtems_region_get_segment - get 3080 byte segment from region 1 - NO_WAIT -TA1 - got segment from region 1 - 0x00000378 +TA1 - got segment from region 1 - 0x00000010 TA1 - rtems_task_wake_after - yield processor TA2 - rtems_region_get_segment - wait on 2K segment from region 1 -TA3 - rtems_region_get_segment - wait on 3968 byte segment from region 2 +TA3 - rtems_region_get_segment - wait on 3950 byte segment from region 2 <pause> -TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000378 +TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000010 TA1 - rtems_region_get_segment - wait 10 seconds for 3K segment from region 1 -TA2 - got segment from region 1 - 0x000007f8 -TA2 - rtems_region_return_segment - return segment to region 1 - 0x000007f8 +TA2 - got segment from region 1 - 0x00000010 +TA2 - rtems_region_return_segment - return segment to region 1 - 0x00000010 TA2 - rtems_task_set_priority - make self highest priority task -TA2 - rtems_region_get_segment - wait on 3968 byte segment -TA1 - got segment from region 1 - 0x000003f8 -TA1 - rtems_region_return_segment - return segment to region 2 - 0x00000f78 -TA2 - got segment from region 2 - 0x00000008 -TA2 - rtems_region_return_segment - return segment to region 2 - 0x00000008 +TA2 - rtems_region_get_segment - wait on 3950 byte segment +TA1 - got segment from region 1 - 0x00000010 +TA1 - rtems_region_return_segment - return segment to region 2 - 0x00000060 +TA2 - got segment from region 2 - 0x00000060 +TA2 - rtems_region_return_segment - return segment to region 2 - 0x00000060 TA2 - rtems_task_delete - delete self TA1 - rtems_task_wake_after - yield processor -TA3 - got segment from region 2 - 0x00000008 +TA3 - got segment from region 2 - 0x00000060 TA3 - rtems_region_get_segment - wait on 2K segment from region 3 TA1 - rtems_task_delete - delete TA3 <pause> TA1 - rtems_task_wake_after - yield processor TA4 - rtems_region_get_segment - wait on 1.5K segment from region 1 TA5 - rtems_region_get_segment - wait on 1.5K segment from region 1 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x000003f8 +TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000010 TA1 - rtems_task_wake_after - yield processor -TA4 - got and returned 0x000009f8 -TA5 - got and returned 0x000003f0 +TA4 - got and returned 0x00000010 +TA5 - got and returned 0x00000690 TA1 - rtems_region_get_segment - wait 10 seconds for 3K segment from region 1 -TA1 - got segment from region 1 - 0x000003f8 +TA1 - got segment from region 1 - 0x00000010 TA1 - rtems_task_wake_after - yield processor -TA4 - rtems_region_get_segment - wait on 3K segment from region 1 TA5 - rtems_region_get_segment - wait on 3K segment from region 1 +TA4 - rtems_region_get_segment - wait on 3K segment from region 1 TA1 - rtems_task_delete - delete TA4 -TA1 - rtems_region_return_segment - return segment to region 1 - 0x000003f8 +TA1 - rtems_region_return_segment - return segment to region 1 - 0x00000010 TA1 - rtems_task_wake_after - yield processor -TA5 - got segment from region 1 - 0x000003f8 -TA5 - rtems_region_return_segment - return segment to region 1 - 0x000003f8 +TA5 - got segment from region 1 - 0x00000010 +TA5 - rtems_region_return_segment - return segment to region 1 - 0x00000010 TA5 - rtems_task_delete - delete self TA1 - rtems_region_delete - delete region 1 TA1 - rtems_region_get_segment - get 3K segment from region 4 -TA1 - got segment from region 4 - 0x000003f8 +TA1 - got segment from region 4 - 0x00000060 TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4 TA1 - rtems_task_get_note - RTEMS_UNSATISFIED TA1 - rtems_region_extend - extend region 4 by 4K TA1 - rtems_region_get_segment - attempt to get 3K segment from region 4 -TA1 - got 3K segment from region 4 - 0x00001400 -TA1 - rtems_region_return_segment - return segment to region 4 - 0x000003f8 -TA1 - rtems_region_return_segment - return segment to region 4 - 0x00001400 +TA1 - got 3K segment from region 4 - 0x00000ce0 +TA1 - rtems_region_return_segment - return segment to region 4 - 0x00000060 +TA1 - rtems_region_return_segment - return segment to region 4 - 0x00000ce0 TA1 - rtems_region_delete - delete region 4 *** END OF TEST 16 *** |