Changeset 7e260d6 in rtems


Ignore:
Timestamp:
Jul 30, 2009, 5:10:04 PM (10 years ago)
Author:
Joel Sherrill <joel.sherrill@…>
Branches:
4.10, 4.11, master
Children:
d6675bf
Parents:
4ac7e272
Message:

2009-07-30 Joel Sherrill <joel.sherrill@…>

  • sp42/Makefile.am, sp42/init.c, sp42/sp42.scn: Test was testing the wrong thing in a cpp macro. Added contents to screen file and add documentation file.
  • sp42/sp42.doc: New file.
Location:
testsuites/sptests
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • testsuites/sptests/ChangeLog

    r4ac7e272 r7e260d6  
     12009-07-30      Joel Sherrill <joel.sherrill@OARcorp.com>
     2
     3        * sp42/Makefile.am, sp42/init.c, sp42/sp42.scn: Test was testing the
     4        wrong thing in a cpp macro. Added contents to screen file and add
     5        documentation file.
     6        * sp42/sp42.doc: New file.
     7
    182009-07-30      Joel Sherrill <joel.sherrill@OARcorp.com>
    29
  • testsuites/sptests/sp42/Makefile.am

    r4ac7e272 r7e260d6  
    99
    1010dist_rtems_tests_DATA = sp42.scn
     11dist_rtems_tests_DATA += sp42.doc
    1112
    1213include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
  • testsuites/sptests/sp42/init.c

    r4ac7e272 r7e260d6  
    3333 * behavior won't be the same when released.
    3434 */
    35 #if (RTEMS_MAXIMUM_PRIORITY >= 64)
    36 rtems_task_priority Priorities[MAX_TASKS] = {
     35rtems_task_priority Priorities_High[MAX_TASKS] = {
    3736  37, 37, 37, 37,       /* backward - more 2-n */
    3837  2, 2, 2, 2,           /* forward - multiple are on 2-n chain */
     
    4241  34, 34, 34, 34,       /* backward - multple on 2-n chain */
    4342};
    44 #else
    45 rtems_task_priority Priorities[MAX_TASKS] = {
     43
     44rtems_task_priority Priorities_Low[MAX_TASKS] = {
    4645  13, 13, 13, 13,       /* backward - more 2-n */
    4746  2, 2, 2, 2,           /* forward - multiple are on 2-n chain */
     
    5150  12, 12, 12, 12,       /* backward - multple on 2-n chain */
    5251};
    53 #endif
    54 
     52
     53rtems_task_priority *Priorities;
    5554
    5655rtems_id   Semaphore;
     
    150149)
    151150{
    152   puts( "\n\n*** START OF TEST 40 ***" );
    153 
    154   if ( sizeof( Priorities ) / sizeof( rtems_task_priority ) != MAX_TASKS ) {
    155     puts( "Priorities table does not have right number of entries" );
    156     exit( 0 );
     151  puts( "\n\n*** START OF TEST 42 ***" );
     152
     153  if (RTEMS_MAXIMUM_PRIORITY == 255)
     154    Priorities = Priorities_High;
     155  else if (RTEMS_MAXIMUM_PRIORITY == 15)
     156    Priorities = Priorities_Low;
     157  else {
     158    puts( "Test only supports 256 or 16 configured priority levels" );
     159    rtems_test_exit( 0 );
     160  }
     161
     162  if ( sizeof(Priorities_Low) / sizeof(rtems_task_priority) != MAX_TASKS ) {
     163    puts( "Priorities_Low table does not have right number of entries" );
     164    rtems_test_exit( 0 );
     165  }
     166
     167  if ( sizeof(Priorities_High) / sizeof(rtems_task_priority) != MAX_TASKS ) {
     168    puts( "Priorities_High table does not have right number of entries" );
     169    rtems_test_exit( 0 );
    157170  }
    158171
     
    172185
    173186  puts( "*** END OF TEST 42 ***" );
    174   exit(0);
     187  rtems_test_exit(0);
    175188}
    176189
  • testsuites/sptests/sp42/sp42.scn

    r4ac7e272 r7e260d6  
     1*** START OF TEST 42 ***
     2Exercising blocking discipline w/extract in FIFO order
     3Exercising blocking discipline w/unblock in FIFO order
     4TA00 - unblocked - OK
     5TA01 - unblocked - OK
     6TA02 - unblocked - OK
     7TA03 - unblocked - OK
     8TA04 - unblocked - OK
     9TA05 - unblocked - OK
     10TA06 - unblocked - OK
     11TA07 - unblocked - OK
     12TA08 - unblocked - OK
     13TA09 - unblocked - OK
     14TA10 - unblocked - OK
     15TA11 - unblocked - OK
     16TA12 - unblocked - OK
     17TA13 - unblocked - OK
     18TA14 - unblocked - OK
     19TA15 - unblocked - OK
     20TA16 - unblocked - OK
     21TA17 - unblocked - OK
     22TA18 - unblocked - OK
     23TA19 - unblocked - OK
     24<pause - screen 2>
     25Exercising blocking discipline w/extract in priority order
     26Exercising blocking discipline w/unblock in priority order
     27TA04 - unblocked - OK
     28TA05 - unblocked - OK
     29TA06 - unblocked - OK
     30TA07 - unblocked - OK
     31TA09 - unblocked - OK
     32TA10 - unblocked - OK
     33TA11 - unblocked - OK
     34TA12 - unblocked - OK
     35TA13 - unblocked - OK
     36TA08 - unblocked - OK
     37TA16 - unblocked - OK
     38TA17 - unblocked - OK
     39TA18 - unblocked - OK
     40TA19 - unblocked - OK
     41TA00 - unblocked - OK
     42TA01 - unblocked - OK
     43TA02 - unblocked - OK
     44TA03 - unblocked - OK
     45TA15 - unblocked - OK
     46TA14 - unblocked - OK
     47*** END OF TEST 42 ***
Note: See TracChangeset for help on using the changeset viewer.