10 files changed, 26 insertions, 22 deletions
diff --git a/testsuites/sptests/sperror01/init.c b/testsuites/sptests/sperror01/init.c
index a84eaf9293..fe3f304e1d 100644
--- a/testsuites/sptests/sperror01/init.c
+++ b/testsuites/sptests/sperror01/init.c
@@ -25,13 +25,13 @@ rtems_task Init(rtems_task_argument argument);
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code error
 )
 {
   if (
     source == RTEMS_FATAL_SOURCE_EXIT
-      && !is_internal
+      && !always_set_to_false
       && error == ENOMEM
   ) {
     TEST_END();
diff --git a/testsuites/sptests/sperror02/init.c b/testsuites/sptests/sperror02/init.c
index 0bb7ceaf34..67fc56da40 100644
--- a/testsuites/sptests/sperror02/init.c
+++ b/testsuites/sptests/sperror02/init.c
@@ -25,13 +25,13 @@ rtems_task Init(rtems_task_argument argument);
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code error
 )
 {
   if (
     source == RTEMS_FATAL_SOURCE_EXIT
-      && !is_internal
+      && !always_set_to_false
       && error == 1
   ) {
     TEST_END();
diff --git a/testsuites/sptests/sperror03/init.c b/testsuites/sptests/sperror03/init.c
index aecdb79288..448848da08 100644
--- a/testsuites/sptests/sperror03/init.c
+++ b/testsuites/sptests/sperror03/init.c
@@ -22,13 +22,13 @@ rtems_task Init(rtems_task_argument argument);
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code error
 )
 {
   if (
     source == RTEMS_FATAL_SOURCE_EXIT
-      && !is_internal
+      && !always_set_to_false
       && error == 0
   ) {
     TEST_END();
diff --git a/testsuites/sptests/spextensions01/init.c b/testsuites/sptests/spextensions01/init.c
index 1d682557c7..ceb9f60527 100644
--- a/testsuites/sptests/spextensions01/init.c
+++ b/testsuites/sptests/spextensions01/init.c
@@ -142,7 +142,7 @@ static void zero_thread_exitted(rtems_tcb *a)
 
 static void zero_fatal(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code code
 )
 {
@@ -201,7 +201,7 @@ static void one_thread_exitted(rtems_tcb *a)
 
 static void one_fatal(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code code
 )
 {
@@ -260,7 +260,7 @@ static void two_thread_exitted(rtems_tcb *a)
 
 static void two_fatal(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code code
 )
 {
@@ -321,7 +321,7 @@ static void three_thread_exitted(rtems_tcb *a)
 
 static void three_fatal(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code code
 )
 {
diff --git a/testsuites/sptests/spfatal26/init.c b/testsuites/sptests/spfatal26/init.c
index 4013b948fc..7d204389b8 100644
--- a/testsuites/sptests/spfatal26/init.c
+++ b/testsuites/sptests/spfatal26/init.c
@@ -61,12 +61,12 @@ static void Init( rtems_task_argument arg )
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code code
 )
 {
   rtems_test_assert( source == RTEMS_FATAL_SOURCE_EXCEPTION );
-  rtems_test_assert( !is_internal );
+  rtems_test_assert( !always_set_to_false );
 
   rtems_exception_frame_print( (const rtems_exception_frame *) code );
 
diff --git a/testsuites/sptests/spfatal_support/init.c b/testsuites/sptests/spfatal_support/init.c
index aa49a301ee..f9b2ed37c1 100644
--- a/testsuites/sptests/spfatal_support/init.c
+++ b/testsuites/sptests/spfatal_support/init.c
@@ -65,7 +65,7 @@ static bool is_expected_error( rtems_fatal_code error )
 
 void Fatal_extension(
   rtems_fatal_source source,
-  bool               is_internal,
+  bool               always_set_to_false,
   rtems_fatal_code   error
 )
 {
@@ -80,7 +80,7 @@ void Fatal_extension(
     printk( ")\n" );
   }
 
-  if ( is_internal )
+  if ( always_set_to_false )
     printk(
       "ERROR==> Fatal Extension is internal set to true expected false\n"
     );
@@ -97,7 +97,7 @@ void Fatal_extension(
 
   if (
     source == FATAL_ERROR_EXPECTED_SOURCE
-      && !is_internal
+      && !always_set_to_false
       && is_expected_error( error )
   ) {
     TEST_END();
diff --git a/testsuites/sptests/spfatal_support/system.h b/testsuites/sptests/spfatal_support/system.h
index 0a01e21d70..ee32428352 100644
--- a/testsuites/sptests/spfatal_support/system.h
+++ b/testsuites/sptests/spfatal_support/system.h
@@ -28,7 +28,7 @@ rtems_task Init(
 
 void Fatal_extension(
   rtems_fatal_source source,
-  bool               is_internal,
+  bool               always_set_to_false,
   rtems_fatal_code   error
 );
 
diff --git a/testsuites/sptests/spinternalerror01/init.c b/testsuites/sptests/spinternalerror01/init.c
index 6201aff566..21e42e358b 100644
--- a/testsuites/sptests/spinternalerror01/init.c
+++ b/testsuites/sptests/spinternalerror01/init.c
@@ -35,13 +35,17 @@ void boot_card( const char *cmdline )
 
 static void fatal_extension(
   Internal_errors_Source source,
-  bool is_internal,
+  bool always_set_to_false,
   Internal_errors_t error
 )
 {
   TEST_BEGIN();
 
-  if ( source == FATAL_SOURCE && !is_internal && error == FATAL_ERROR ) {
+  if (
+    source == FATAL_SOURCE
+      && !always_set_to_false
+      && error == FATAL_ERROR
+  ) {
     TEST_END();
   }
 }
diff --git a/testsuites/sptests/spmutex01/init.c b/testsuites/sptests/spmutex01/init.c
index 72e458f167..0c216a3901 100644
--- a/testsuites/sptests/spmutex01/init.c
+++ b/testsuites/sptests/spmutex01/init.c
@@ -689,14 +689,14 @@ static void Init(rtems_task_argument arg)
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code error
 )
 {
 
   if (
     source == INTERNAL_ERROR_CORE
-      && !is_internal
+      && !always_set_to_false
       && error == INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK
   ) {
     test_context *ctx = &test_instance;
diff --git a/testsuites/sptests/spsyslock01/init.c b/testsuites/sptests/spsyslock01/init.c
index 1e0d481873..815579a0d9 100644
--- a/testsuites/sptests/spsyslock01/init.c
+++ b/testsuites/sptests/spsyslock01/init.c
@@ -686,14 +686,14 @@ static void Init(rtems_task_argument arg)
 
 static void fatal_extension(
   rtems_fatal_source source,
-  bool is_internal,
+  bool always_set_to_false,
   rtems_fatal_code error
 )
 {
 
   if (
     source == INTERNAL_ERROR_CORE
-      && !is_internal
+      && !always_set_to_false
       && error == INTERNAL_ERROR_THREAD_QUEUE_DEADLOCK
   ) {
     test_context *ctx = &test_instance;