From abd29cb95a7a845bca3b0f31d5167b03568312e0 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 6 May 2011 17:29:35 +0000 Subject: 2011-05-06 Joel Sherrill * sp39/init.c: Fix tests broken in warning pass. --- testsuites/sptests/ChangeLog | 4 ++++ testsuites/sptests/sp39/init.c | 16 ++++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) (limited to 'testsuites/sptests') diff --git a/testsuites/sptests/ChangeLog b/testsuites/sptests/ChangeLog index 737cebe4fb..eaf429a3e2 100644 --- a/testsuites/sptests/ChangeLog +++ b/testsuites/sptests/ChangeLog @@ -1,3 +1,7 @@ +2011-05-06 Joel Sherrill + + * sp39/init.c: Fix tests broken in warning pass. + 2011-05-06 Sebastian Huber * spnsext01/.cvsignore, spnsext01/Makefile.am, spnsext01/init.c, diff --git a/testsuites/sptests/sp39/init.c b/testsuites/sptests/sp39/init.c index 81dcd4f315..bda1c8d592 100644 --- a/testsuites/sptests/sp39/init.c +++ b/testsuites/sptests/sp39/init.c @@ -18,6 +18,14 @@ #define CONFIGURE_INIT #include "system.h" +/* + * ERROR CHECKING NOTE: + * + * We are either at dispatch disable level 1 or 2. Either way, it is + * safer not to check the dispatch level explicitly so we are using + * fatal_directive_check_status_only() not directive_failed(). + */ + rtems_timer_service_routine test_event_from_isr( rtems_id timer, void *arg @@ -45,19 +53,19 @@ rtems_timer_service_routine test_event_from_isr( * another task so doesn't impact this critical section. */ status = rtems_event_send( other_task, 0x02 ); - directive_failed( status, "event send" ); + fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" ); /* * This event send hits the main task but doesn't satisfy * it's blocking condition so it will still block */ status = rtems_event_send( main_task, 0x02 ); - directive_failed( status, "event send" ); + fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" ); case_hit = TRUE; } status = rtems_event_send( main_task, 0x01 ); - directive_failed( status, "event send" ); + fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" ); } rtems_timer_service_routine test_event_with_timeout_from_isr( @@ -75,7 +83,7 @@ rtems_timer_service_routine test_event_with_timeout_from_isr( case_hit = TRUE; } status = rtems_event_send( main_task, 0x01 ); - directive_failed( status, "event send" ); + fatal_directive_check_status_only( status, RTEMS_SUCCESSFUL, "event send" ); } rtems_task Init( -- cgit v1.2.3