Changeset d37aa444 in rtems


Ignore:
Timestamp:
11/16/99 15:39:08 (24 years ago)
Author:
Jennifer Averett <Jennifer.Averett@…>
Branches:
4.10, 4.11, 4.8, 4.9, 5, master
Children:
e9b00d7
Parents:
2d82857
Message:

Changed asserts to tmmacros.

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • c/src/tests/itrontests/itrontask03/init.c

    r2d82857 rd37aa444  
    5858  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    5959  directive_failed( status, "INIT - ref_tsk of RTEMS_PREEMPT");
    60   assert( pk_rtsk.tskstat == TTS_DMT );
     60  fatal_directive_status(pk_rtsk.tskstat,TTS_DMT,"tskstat of PREEMPT");
    6161 
    6262  /*
     
    7171  puts( "INIT - ref_tsk PREEMPT - Validate no longer exists" );
    7272  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    73   assert( status == E_NOEXS );
    74 
     73  fatal_directive_status( status, E_NOEXS, "tskstat of PREEMPT");
    7574  status = chg_pri( TSK_SELF, PREEMPT_PRIORITY );
    7675  directive_failed( status, "chg_pri of SELF" );
     
    9998  status  = sta_tsk( TA3_ID, 0 );
    10099  directive_failed( status, "sta_tsk of TA3" );
    101   puts( "INIT - ref_tsk TA1 - Validate READY STATE" );
     100
    102101  status = ref_tsk( &pk_rtsk, TA1_ID);
    103102  directive_failed( status, "INIT - ref_tsk of TA1");
    104   assert( pk_rtsk.tskstat == TTS_RDY );
     103  fatal_directive_status( pk_rtsk.tskstat, TTS_RDY , "tskstat of TA1");
    105104
    106105  puts( "INIT - suspending TA2 while middle task on a ready chain" );
     
    109108  status = ref_tsk( &pk_rtsk, TA2_ID);
    110109  directive_failed( status, "INIT - ref_tsk of TA2");
    111   assert( pk_rtsk.tskstat == TTS_SUS );
     110  fatal_directive_status( pk_rtsk.tskstat, TTS_SUS, "tskstat of TA2");
    112111
    113112  status = ter_tsk( TA1_ID );
     
    131130  status  = sta_tsk( TA3_ID, 0 );
    132131  directive_failed( status, "sta_tsk of TA3" );
    133  
     132
    134133  exd_tsk();
    135134  assert(0);
  • c/src/tests/itrontests/itrontask03/preempt.c

    r2d82857 rd37aa444  
    3131  puts( "PREEMPT - ref_tsk validation"  );
    3232  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    33   assert( status          == E_OK );
     33  fatal_directive_status( status, E_OK , "ref_tsk of PREEMPT");
    3434  assert( pk_rtsk.tskpri  == PREEMPT_PRIORITY );
    3535  assert( pk_rtsk.itskpri == PREEMPT_PRIORITY );
  • testsuites/itrontests/itrontask03/init.c

    r2d82857 rd37aa444  
    5858  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    5959  directive_failed( status, "INIT - ref_tsk of RTEMS_PREEMPT");
    60   assert( pk_rtsk.tskstat == TTS_DMT );
     60  fatal_directive_status(pk_rtsk.tskstat,TTS_DMT,"tskstat of PREEMPT");
    6161 
    6262  /*
     
    7171  puts( "INIT - ref_tsk PREEMPT - Validate no longer exists" );
    7272  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    73   assert( status == E_NOEXS );
    74 
     73  fatal_directive_status( status, E_NOEXS, "tskstat of PREEMPT");
    7574  status = chg_pri( TSK_SELF, PREEMPT_PRIORITY );
    7675  directive_failed( status, "chg_pri of SELF" );
     
    9998  status  = sta_tsk( TA3_ID, 0 );
    10099  directive_failed( status, "sta_tsk of TA3" );
    101   puts( "INIT - ref_tsk TA1 - Validate READY STATE" );
     100
    102101  status = ref_tsk( &pk_rtsk, TA1_ID);
    103102  directive_failed( status, "INIT - ref_tsk of TA1");
    104   assert( pk_rtsk.tskstat == TTS_RDY );
     103  fatal_directive_status( pk_rtsk.tskstat, TTS_RDY , "tskstat of TA1");
    105104
    106105  puts( "INIT - suspending TA2 while middle task on a ready chain" );
     
    109108  status = ref_tsk( &pk_rtsk, TA2_ID);
    110109  directive_failed( status, "INIT - ref_tsk of TA2");
    111   assert( pk_rtsk.tskstat == TTS_SUS );
     110  fatal_directive_status( pk_rtsk.tskstat, TTS_SUS, "tskstat of TA2");
    112111
    113112  status = ter_tsk( TA1_ID );
     
    131130  status  = sta_tsk( TA3_ID, 0 );
    132131  directive_failed( status, "sta_tsk of TA3" );
    133  
     132
    134133  exd_tsk();
    135134  assert(0);
  • testsuites/itrontests/itrontask03/preempt.c

    r2d82857 rd37aa444  
    3131  puts( "PREEMPT - ref_tsk validation"  );
    3232  status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID );
    33   assert( status          == E_OK );
     33  fatal_directive_status( status, E_OK , "ref_tsk of PREEMPT");
    3434  assert( pk_rtsk.tskpri  == PREEMPT_PRIORITY );
    3535  assert( pk_rtsk.itskpri == PREEMPT_PRIORITY );
Note: See TracChangeset for help on using the changeset viewer.