diff options
Diffstat (limited to 'testsuites/sptests')
28 files changed, 9 insertions, 47 deletions
diff --git a/testsuites/sptests/spfatal01/testcase.h b/testsuites/sptests/spfatal01/testcase.h index 9ac322a890..01710dc886 100644 --- a/testsuites/sptests/spfatal01/testcase.h +++ b/testsuites/sptests/spfatal01/testcase.h @@ -25,7 +25,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_TEST_NAME "1" #define FATAL_ERROR_DESCRIPTION "Classic API Init task create failure" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_UNSATISFIED void force_error() diff --git a/testsuites/sptests/spfatal02/testcase.h b/testsuites/sptests/spfatal02/testcase.h index bd9ac6785e..8ed2f44284 100644 --- a/testsuites/sptests/spfatal02/testcase.h +++ b/testsuites/sptests/spfatal02/testcase.h @@ -25,7 +25,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_TEST_NAME "2" #define FATAL_ERROR_DESCRIPTION "Classic API Init task start failure" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR \ INTERNAL_ERROR_RTEMS_INIT_TASK_ENTRY_IS_NULL diff --git a/testsuites/sptests/spfatal03/testcase.h b/testsuites/sptests/spfatal03/testcase.h index 7b98cc3699..90ed0535b3 100644 --- a/testsuites/sptests/spfatal03/testcase.h +++ b/testsuites/sptests/spfatal03/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "3" #define FATAL_ERROR_DESCRIPTION "Core Mutex obtain in critical section" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR \ INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL diff --git a/testsuites/sptests/spfatal04/testcase.h b/testsuites/sptests/spfatal04/testcase.h index 98429b4aeb..323a77762c 100644 --- a/testsuites/sptests/spfatal04/testcase.h +++ b/testsuites/sptests/spfatal04/testcase.h @@ -26,7 +26,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_DESCRIPTION \ "Classic API call rtems_fatal_error_occurred" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR 0xdead void force_error() diff --git a/testsuites/sptests/spfatal05/testcase.h b/testsuites/sptests/spfatal05/testcase.h index 8900aefe5d..933b7a5d45 100644 --- a/testsuites/sptests/spfatal05/testcase.h +++ b/testsuites/sptests/spfatal05/testcase.h @@ -34,7 +34,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_TEST_NAME "5" #define FATAL_ERROR_DESCRIPTION "Core fall out of a task" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_THREAD_EXITTED rtems_task EmptyTask( rtems_task_argument unused ); diff --git a/testsuites/sptests/spfatal06/testcase.h b/testsuites/sptests/spfatal06/testcase.h index db823da6f8..8ec16271fe 100644 --- a/testsuites/sptests/spfatal06/testcase.h +++ b/testsuites/sptests/spfatal06/testcase.h @@ -33,7 +33,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_DESCRIPTION \ "Core initialize with invalid stack hook" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_BAD_STACK_HOOK void *New_stack_allocate_hook(size_t unused); diff --git a/testsuites/sptests/spfatal07/testcase.h b/testsuites/sptests/spfatal07/testcase.h index 7cc9a5f468..4db2cf133e 100644 --- a/testsuites/sptests/spfatal07/testcase.h +++ b/testsuites/sptests/spfatal07/testcase.h @@ -33,7 +33,6 @@ rtems_initialization_tasks_table Initialization_tasks[] = { #define FATAL_ERROR_DESCRIPTION \ "Core Configuration Invalid ISR stack size" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR \ INTERNAL_ERROR_INTERRUPT_STACK_TOO_SMALL diff --git a/testsuites/sptests/spfatal08/testcase.h b/testsuites/sptests/spfatal08/testcase.h index 12c8d4eed1..03e7ca5305 100644 --- a/testsuites/sptests/spfatal08/testcase.h +++ b/testsuites/sptests/spfatal08/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "8" #define FATAL_ERROR_DESCRIPTION "Core workspace too small" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_WORKSPACE_ALLOCATION void force_error() diff --git a/testsuites/sptests/spfatal09/testcase.h b/testsuites/sptests/spfatal09/testcase.h index 7e9b10f4d1..07b03af206 100644 --- a/testsuites/sptests/spfatal09/testcase.h +++ b/testsuites/sptests/spfatal09/testcase.h @@ -15,7 +15,6 @@ #define FATAL_ERROR_TEST_NAME "9" #define FATAL_ERROR_DESCRIPTION "Bad heap address to malloc" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_NO_MEMORY_FOR_HEAP void force_error() diff --git a/testsuites/sptests/spfatal10/testcase.h b/testsuites/sptests/spfatal10/testcase.h index ae1e99e037..df4125e7da 100644 --- a/testsuites/sptests/spfatal10/testcase.h +++ b/testsuites/sptests/spfatal10/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "10" #define FATAL_ERROR_DESCRIPTION "asserting with non-NULL strings..." #define FATAL_ERROR_EXPECTED_SOURCE RTEMS_FATAL_SOURCE_ASSERT -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR_CHECK spfatal10_is_expected_error #define ASSERT_FILE "testcase.h" diff --git a/testsuites/sptests/spfatal11/testcase.h b/testsuites/sptests/spfatal11/testcase.h index 3efa7e5bcb..ddd37a66fe 100644 --- a/testsuites/sptests/spfatal11/testcase.h +++ b/testsuites/sptests/spfatal11/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "11" #define FATAL_ERROR_DESCRIPTION "asserting with NULL strings..." #define FATAL_ERROR_EXPECTED_SOURCE RTEMS_FATAL_SOURCE_ASSERT -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR_CHECK spfatal11_is_expected_error #define ASSERT_FILE "testcase.h" diff --git a/testsuites/sptests/spfatal12/testcase.h b/testsuites/sptests/spfatal12/testcase.h index 0aac3b1337..8b3d40926c 100644 --- a/testsuites/sptests/spfatal12/testcase.h +++ b/testsuites/sptests/spfatal12/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_DESCRIPTION \ "_Heap_Initialize fails during RTEMS initialization" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_TOO_LITTLE_WORKSPACE void force_error() diff --git a/testsuites/sptests/spfatal13/testcase.h b/testsuites/sptests/spfatal13/testcase.h index b99ff4dc5b..6f82689958 100644 --- a/testsuites/sptests/spfatal13/testcase.h +++ b/testsuites/sptests/spfatal13/testcase.h @@ -12,7 +12,6 @@ #define FATAL_ERROR_DESCRIPTION \ "Configuration of unlimited and maximum of 0" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_UNLIMITED_AND_MAXIMUM_IS_0 /* diff --git a/testsuites/sptests/spfatal14/testcase.h b/testsuites/sptests/spfatal14/testcase.h index 4aded0a3f2..3dcd0308e6 100644 --- a/testsuites/sptests/spfatal14/testcase.h +++ b/testsuites/sptests/spfatal14/testcase.h @@ -12,7 +12,6 @@ #define FATAL_ERROR_TEST_NAME "14" #define FATAL_ERROR_DESCRIPTION "fail to open stdout" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR 0x55544431 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 1 diff --git a/testsuites/sptests/spfatal15/testcase.h b/testsuites/sptests/spfatal15/testcase.h index d1527fd3e3..742b5b992d 100644 --- a/testsuites/sptests/spfatal15/testcase.h +++ b/testsuites/sptests/spfatal15/testcase.h @@ -11,7 +11,6 @@ #define FATAL_ERROR_TEST_NAME "15" #define FATAL_ERROR_DESCRIPTION "fail to open stderr" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR 0x55544432 #define CONFIGURE_LIBIO_MAXIMUM_FILE_DESCRIPTORS 2 diff --git a/testsuites/sptests/spfatal16/testcase.h b/testsuites/sptests/spfatal16/testcase.h index 743b2be9b5..412f20e04a 100644 --- a/testsuites/sptests/spfatal16/testcase.h +++ b/testsuites/sptests/spfatal16/testcase.h @@ -16,7 +16,6 @@ #define FATAL_ERROR_TEST_NAME "16" #define FATAL_ERROR_DESCRIPTION "termios sem create #1" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY #define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \ diff --git a/testsuites/sptests/spfatal17/testcase.h b/testsuites/sptests/spfatal17/testcase.h index 78f1b40f59..2f1046ab49 100644 --- a/testsuites/sptests/spfatal17/testcase.h +++ b/testsuites/sptests/spfatal17/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "17" #define FATAL_ERROR_DESCRIPTION "termios sem create #2" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY #define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \ diff --git a/testsuites/sptests/spfatal18/testcase.h b/testsuites/sptests/spfatal18/testcase.h index cb42543c9e..eab617c1cf 100644 --- a/testsuites/sptests/spfatal18/testcase.h +++ b/testsuites/sptests/spfatal18/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "18" #define FATAL_ERROR_DESCRIPTION "termios sem create #3" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY #define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \ diff --git a/testsuites/sptests/spfatal19/testcase.h b/testsuites/sptests/spfatal19/testcase.h index daa53b9141..16ef09da3b 100644 --- a/testsuites/sptests/spfatal19/testcase.h +++ b/testsuites/sptests/spfatal19/testcase.h @@ -14,7 +14,6 @@ #define FATAL_ERROR_TEST_NAME "19" #define FATAL_ERROR_DESCRIPTION "termios sem create #4" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY #define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \ diff --git a/testsuites/sptests/spfatal20/testcase.h b/testsuites/sptests/spfatal20/testcase.h index 1000f8ff3b..863982aee0 100644 --- a/testsuites/sptests/spfatal20/testcase.h +++ b/testsuites/sptests/spfatal20/testcase.h @@ -11,7 +11,6 @@ #define FATAL_ERROR_DESCRIPTION \ "rtems_termios_initialize cannot create semaphore" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_TOO_MANY #define CONFIGURE_APPLICATION_PREREQUISITE_DRIVERS \ diff --git a/testsuites/sptests/spfatal24/testcase.h b/testsuites/sptests/spfatal24/testcase.h index 87cbe534a8..19a7547304 100644 --- a/testsuites/sptests/spfatal24/testcase.h +++ b/testsuites/sptests/spfatal24/testcase.h @@ -13,7 +13,6 @@ #define FATAL_ERROR_TEST_NAME "GXX KEY ADD FAILURE" #define FATAL_ERROR_DESCRIPTION "GXX KEY ADD FAILURE" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_GXX_KEY_ADD_FAILED void force_error() diff --git a/testsuites/sptests/spfatal25/testcase.h b/testsuites/sptests/spfatal25/testcase.h index fb800bf928..c2c97e4744 100644 --- a/testsuites/sptests/spfatal25/testcase.h +++ b/testsuites/sptests/spfatal25/testcase.h @@ -12,7 +12,6 @@ #define FATAL_ERROR_TEST_NAME "GXX MUTEX INIT FAILED" #define FATAL_ERROR_DESCRIPTION "GXX MUTEX INIT FAILED" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL TRUE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_GXX_MUTEX_INIT_FAILED void force_error() diff --git a/testsuites/sptests/spfatal27/testcase.h b/testsuites/sptests/spfatal27/testcase.h index 29ef3272d9..a7b26bd319 100644 --- a/testsuites/sptests/spfatal27/testcase.h +++ b/testsuites/sptests/spfatal27/testcase.h @@ -15,7 +15,6 @@ #define FATAL_ERROR_TEST_NAME "27" #define FATAL_ERROR_DESCRIPTION "libio init no posix key left" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_RTEMS_API -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR RTEMS_UNSATISFIED #define CONFIGURE_MAXIMUM_POSIX_KEYS (-1) diff --git a/testsuites/sptests/spfatal28/testcase.h b/testsuites/sptests/spfatal28/testcase.h index 9741760dc9..fda4122b46 100644 --- a/testsuites/sptests/spfatal28/testcase.h +++ b/testsuites/sptests/spfatal28/testcase.h @@ -15,7 +15,6 @@ #define FATAL_ERROR_TEST_NAME "28" #define FATAL_ERROR_DESCRIPTION "delete a task with a semaphore in use" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_RESOURCE_IN_USE #define CONFIGURE_MAXIMUM_SEMAPHORES 1 @@ -38,6 +37,6 @@ void force_error() sc = rtems_task_delete(RTEMS_SELF); rtems_test_assert(sc == RTEMS_SUCCESSFUL); #else - _Terminate( INTERNAL_ERROR_CORE, false, INTERNAL_ERROR_RESOURCE_IN_USE ); + _Terminate( INTERNAL_ERROR_CORE, INTERNAL_ERROR_RESOURCE_IN_USE ); #endif } diff --git a/testsuites/sptests/spfatal29/testcase.h b/testsuites/sptests/spfatal29/testcase.h index 096a66ad03..63f74f861b 100644 --- a/testsuites/sptests/spfatal29/testcase.h +++ b/testsuites/sptests/spfatal29/testcase.h @@ -15,7 +15,6 @@ #define FATAL_ERROR_TEST_NAME "29" #define FATAL_ERROR_DESCRIPTION "yield in interrupt context" #define FATAL_ERROR_EXPECTED_SOURCE INTERNAL_ERROR_CORE -#define FATAL_ERROR_EXPECTED_IS_INTERNAL FALSE #define FATAL_ERROR_EXPECTED_ERROR INTERNAL_ERROR_BAD_THREAD_DISPATCH_DISABLE_LEVEL #define CONFIGURE_MAXIMUM_TIMERS 1 diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c index 319dbd2405..aa49a301ee 100644 --- a/testsuites/sptests/spfatal_support/init.c +++ b/testsuites/sptests/spfatal_support/init.c @@ -80,17 +80,10 @@ void Fatal_extension( printk( ")\n" ); } - if ( is_internal != FATAL_ERROR_EXPECTED_IS_INTERNAL ) - { - if ( is_internal == TRUE ) - printk( - "ERROR==> Fatal Extension is internal set to TRUE expected FALSE\n" - ); - else - printk( - "ERROR==> Fatal Extension is internal set to FALSE expected TRUE\n" - ); - } + if ( is_internal ) + printk( + "ERROR==> Fatal Extension is internal set to true expected false\n" + ); #ifdef FATAL_ERROR_EXPECTED_ERROR if ( error != FATAL_ERROR_EXPECTED_ERROR ) { @@ -104,7 +97,7 @@ void Fatal_extension( if ( source == FATAL_ERROR_EXPECTED_SOURCE - && is_internal == FATAL_ERROR_EXPECTED_IS_INTERNAL + && !is_internal && is_expected_error( error ) ) { TEST_END(); diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c index e864db169a..6201aff566 100644 --- a/testsuites/sptests/spinternalerror01/init.c +++ b/testsuites/sptests/spinternalerror01/init.c @@ -26,13 +26,11 @@ const char rtems_test_name[] = "SPINTERNALERROR 1"; #define FATAL_SOURCE 0xdeadbeef -#define FATAL_IS_INTERNAL false - #define FATAL_ERROR 0x600df00d void boot_card( const char *cmdline ) { - _Terminate( FATAL_SOURCE, FATAL_IS_INTERNAL, FATAL_ERROR ); + _Terminate( FATAL_SOURCE, FATAL_ERROR ); } static void fatal_extension( @@ -43,11 +41,7 @@ static void fatal_extension( { TEST_BEGIN(); - if ( - source == FATAL_SOURCE - && is_internal == FATAL_IS_INTERNAL - && error == FATAL_ERROR - ) { + if ( source == FATAL_SOURCE && !is_internal && error == FATAL_ERROR ) { TEST_END(); } } diff --git a/testsuites/sptests/sptimecounter01/init.c b/testsuites/sptests/sptimecounter01/init.c index 9e396de054..179590d538 100644 --- a/testsuites/sptests/sptimecounter01/init.c +++ b/testsuites/sptests/sptimecounter01/init.c @@ -151,7 +151,7 @@ void boot_card(const char *cmdline) TEST_END(); - _Terminate(RTEMS_FATAL_SOURCE_EXIT, false, 0); + _Terminate(RTEMS_FATAL_SOURCE_EXIT, 0); } #define CONFIGURE_APPLICATION_DOES_NOT_NEED_CLOCK_DRIVER |