testsuites: Use _Thread_Get_executing()

5 files changed, 13 insertions, 11 deletions

diff --git a/testsuites/sptests/sp34/changepri.c b/testsuites/sptests/sp34/changepri.c
index 705a1e0edc..d78841ad61 100644
--- a/testsuites/sptests/sp34/changepri.c
+++ b/testsuites/sptests/sp34/changepri.c
@@ -39,9 +39,10 @@ const char *CallerName(void);
 const char *CallerName(void)
 {
   static char buffer[32];
+  Thread_Control *executing = _Thread_Get_executing();
 #if defined(TEST_PRINT_TASK_ID)
   sprintf( buffer, "0x%08x -- %d",
-      rtems_task_self(), _Thread_Executing->current_priority );
+      rtems_task_self(), executing->current_priority );
 #else
   volatile union {
     uint32_t u;
@@ -49,13 +50,13 @@ const char *CallerName(void)
   } TempName;
 
   #if defined(TEST_ON_RTEMS_45)
-    TempName.u = *(uint32_t *)_Thread_Executing->Object.name;
+    TempName.u = *(uint32_t *)executing->Object.name;
   #else
-    TempName.u = _Thread_Executing->Object.name.name_u32;
+    TempName.u = executing->Object.name.name_u32;
   #endif
     sprintf( buffer, "%c%c%c%c -- %" PRIdPriority_Control,
       TempName.c[0], TempName.c[1], TempName.c[2], TempName.c[3],
-      _Thread_Executing->current_priority
+      executing->current_priority
   );
 #endif
   return buffer;
diff --git a/testsuites/sptests/sp35/priinv.c b/testsuites/sptests/sp35/priinv.c
index 24c41d5ea7..ba74c69ebe 100644
--- a/testsuites/sptests/sp35/priinv.c
+++ b/testsuites/sptests/sp35/priinv.c
@@ -81,9 +81,10 @@ void AccessRemoteHw(void);
 const char *CallerName(void)
 {
   static char buffer[32];
+  Thread_Control *executing = _Thread_Get_executing();
 #if defined(TEST_PRINT_TASK_ID)
   sprintf( buffer, "0x%08x -- %d",
-      rtems_task_self(), _Thread_Executing->current_priority );
+      rtems_task_self(), executing->current_priority );
 #else
   volatile union {
     uint32_t u;
@@ -91,13 +92,13 @@ const char *CallerName(void)
   } TempName;
 
   #if defined(TEST_ON_RTEMS_45)
-    TempName.u = *(uint32_t *)_Thread_Executing->Object.name;
+    TempName.u = *(uint32_t *)executing->Object.name;
   #else
-    TempName.u = (uint32_t) _Thread_Executing->Object.name.name_u32;
+    TempName.u = (uint32_t) executing->Object.name.name_u32;
   #endif
   sprintf( buffer, "%c%c%c%c -- %" PRIdPriority_Control,
       TempName.c[0], TempName.c[1], TempName.c[2], TempName.c[3],
-      _Thread_Executing->current_priority
+      executing->current_priority
   );
 #endif
   return buffer;
diff --git a/testsuites/sptests/spintrcritical10/init.c b/testsuites/sptests/spintrcritical10/init.c
index f284780546..5334a26b46 100644
--- a/testsuites/sptests/spintrcritical10/init.c
+++ b/testsuites/sptests/spintrcritical10/init.c
@@ -300,7 +300,7 @@ static rtems_task Init(
 {
   rtems_status_code sc;
   test_context ctx = {
-    .thread = _Thread_Executing
+    .thread = _Thread_Get_executing()
   };
 
   puts( "\n\n*** TEST INTERRUPT CRITICAL SECTION 10 ***" );
diff --git a/testsuites/sptests/spintrcritical16/init.c b/testsuites/sptests/spintrcritical16/init.c
index 4a32de2a47..cdd862fd51 100644
--- a/testsuites/sptests/spintrcritical16/init.c
+++ b/testsuites/sptests/spintrcritical16/init.c
@@ -84,7 +84,7 @@ rtems_task Init(
   directive_failed( sc, "rtems_semaphore_create of SM1" );
 
   Main_task = rtems_task_self();
-  Main_TCB  = _Thread_Executing;
+  Main_TCB  = _Thread_Get_executing();
 
   interrupt_critical_section_test_support_initialize( test_release_from_isr );
 
diff --git a/testsuites/sptests/spthreadq01/init.c b/testsuites/sptests/spthreadq01/init.c
index e03efe6f06..cbe3652578 100644
--- a/testsuites/sptests/spthreadq01/init.c
+++ b/testsuites/sptests/spthreadq01/init.c
@@ -34,7 +34,7 @@ void threadq_first_empty(
   _Thread_queue_Initialize( &tq, discipline, 0x01, 3 );
 
   puts( "Init - _Thread_queue_Extract - thread not blocked on a thread queue" );
-  _Thread_queue_Extract( &tq, _Thread_Executing );
+  _Thread_queue_Extract( &tq, _Thread_Get_executing() );
   /* is there anything to check? */
 }