From d35734dd77149fc96d3a282c16d6eb4c84ec3d66 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 8 Dec 2009 17:52:47 +0000 Subject: 2009-12-08 Joel Sherrill * itronmbf01/init.c, itronsem01/init.c, itronsem01/system.h, itrontask02/dormant.c, itrontask02/init.c, itrontask03/init.c, itrontask03/preempt.c: Use rtems_test_assert() consistently instead of system assert(). rtems_test_assert() is designed to integrate into the RTEMS test suite infrastructure. --- testsuites/itrontests/itrontask03/init.c | 5 ++--- testsuites/itrontests/itrontask03/preempt.c | 17 ++++++++--------- 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'testsuites/itrontests/itrontask03') diff --git a/testsuites/itrontests/itrontask03/init.c b/testsuites/itrontests/itrontask03/init.c index f7d0756a9c..1b204805d0 100644 --- a/testsuites/itrontests/itrontask03/init.c +++ b/testsuites/itrontests/itrontask03/init.c @@ -10,7 +10,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -23,7 +23,6 @@ #define CONFIGURE_INIT #include "system.h" #include -#include void ITRON_Init( void ) { @@ -134,5 +133,5 @@ void ITRON_Init( void ) directive_failed( status, "sta_tsk of TA3" ); exd_tsk(); - assert(0); + rtems_test_assert(0); } diff --git a/testsuites/itrontests/itrontask03/preempt.c b/testsuites/itrontests/itrontask03/preempt.c index e70936d857..0ff6101c23 100644 --- a/testsuites/itrontests/itrontask03/preempt.c +++ b/testsuites/itrontests/itrontask03/preempt.c @@ -7,7 +7,7 @@ * * Output parameters: NONE * - * COPYRIGHT (c) 1989-1999. + * COPYRIGHT (c) 1989-2009. * On-Line Applications Research Corporation (OAR). * * The license and distribution terms for this file may be @@ -17,7 +17,6 @@ * $Id$ */ -#include #include "system.h" int Preempt_task_Count; @@ -30,11 +29,11 @@ void Preempt_task() puts( "PREEMPT - ref_tsk validation" ); status = ref_tsk( &pk_rtsk, PREEMPT_TASK_ID ); fatal_directive_status( status, E_OK , "ref_tsk of PREEMPT"); - assert( pk_rtsk.tskpri == PREEMPT_PRIORITY ); - assert( pk_rtsk.itskpri == PREEMPT_PRIORITY ); - assert( pk_rtsk.task == Preempt_task ); - assert( pk_rtsk.stksz >= RTEMS_MINIMUM_STACK_SIZE ); - assert( pk_rtsk.tskstat == (TTS_RUN | TTS_RDY) ); + rtems_test_assert( pk_rtsk.tskpri == PREEMPT_PRIORITY ); + rtems_test_assert( pk_rtsk.itskpri == PREEMPT_PRIORITY ); + rtems_test_assert( pk_rtsk.task == Preempt_task ); + rtems_test_assert( pk_rtsk.stksz >= RTEMS_MINIMUM_STACK_SIZE ); + rtems_test_assert( pk_rtsk.tskstat == (TTS_RUN | TTS_RDY) ); if ( Preempt_task_Count == 0 ) { Preempt_task_Count ++; @@ -43,11 +42,11 @@ void Preempt_task() directive_failed( status, "chg_pri" ); puts( "PREEMPT - ext_tsk - going to DORMANT state" ); ext_tsk( ); - assert( 0 ); + rtems_test_assert( 0 ); } else { Preempt_task_Count ++; puts( "PREEMPT - exd_tsk - Exit and Delete task" ); exd_tsk( ); - assert( 0 ); + rtems_test_assert( 0 ); } } -- cgit v1.2.3