validation: Add ${.:/test-context-type}

Add and use ${.:/test-context-type} and ${.:/test-context-instance}
substitutions.

10 files changed, 19 insertions, 19 deletions

diff --git a/spec/rtems/task/req/construct.yml b/spec/rtems/task/req/construct.yml
index 5bde19c7..f3f1be49 100644
--- a/spec/rtems/task/req/construct.yml
+++ b/spec/rtems/task/req/construct.yml
@@ -679,7 +679,7 @@ test-stop: null
 test-support: |
   #define NAME rtems_build_name( 'T', 'E', 'S', 'T' )
 
-  typedef RtemsTaskReqConstruct_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static volatile _Thread_local int tls_object;
 
@@ -705,7 +705,7 @@ test-support: |
   static void StorageFree( void *ptr )
   {
     T_eq_ptr( ptr, task_storage );
-    ++RtemsTaskReqConstruct_Instance.storage_free_calls;
+    ++${.:/test-context-instance}.storage_free_calls;
   }
 
   static rtems_status_code Create( void *arg, uint32_t *id )
@@ -728,8 +728,8 @@ test-support: |
     (void) executing;
     (void) created;
 
-    ++RtemsTaskReqConstruct_Instance.create_extension_calls;
-    return RtemsTaskReqConstruct_Instance.create_extension_status;
+    ++${.:/test-context-instance}.create_extension_calls;
+    return ${.:/test-context-instance}.create_extension_status;
   }
 
   static bool SecondThreadCreate( rtems_tcb *executing, rtems_tcb *created )
@@ -737,7 +737,7 @@ test-support: |
     (void) executing;
     (void) created;
 
-    ++RtemsTaskReqConstruct_Instance.create_extension_calls;
+    ++${.:/test-context-instance}.create_extension_calls;
     return true;
   }
 
@@ -747,7 +747,7 @@ test-support: |
 
     (void) executing;
 
-    ctx = &RtemsTaskReqConstruct_Instance;
+    ctx = &${.:/test-context-instance};
 
     if ( deleted->Object.id == ctx->zombie_id ) {
       ++ctx->delete_zombie_extension_calls;
@@ -780,7 +780,7 @@ test-support: |
   {
     Context *ctx;
 
-    ctx = &RtemsTaskReqConstruct_Instance;
+    ctx = &${.:/test-context-instance};
 
     if (
       ctx->scheduler_b_id != INVALID_ID &&
diff --git a/spec/rtems/task/req/create-errors.yml b/spec/rtems/task/req/create-errors.yml
index 4afe26c5..9710180d 100644
--- a/spec/rtems/task/req/create-errors.yml
+++ b/spec/rtems/task/req/create-errors.yml
@@ -345,7 +345,7 @@ test-stop: null
 test-support: |
   #define NAME rtems_build_name( 'T', 'E', 'S', 'T' )
 
-  typedef RtemsTaskReqCreateErrors_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static rtems_status_code Create( void *arg, uint32_t *id )
   {
diff --git a/spec/rtems/task/req/delete.yml b/spec/rtems/task/req/delete.yml
index e717dd18..7f9519bf 100644
--- a/spec/rtems/task/req/delete.yml
+++ b/spec/rtems/task/req/delete.yml
@@ -738,7 +738,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqDelete_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void CaptureWorkerState( Context *ctx )
   {
diff --git a/spec/rtems/task/req/exit.yml b/spec/rtems/task/req/exit.yml
index 46bf4d32..5b4d7b0b 100644
--- a/spec/rtems/task/req/exit.yml
+++ b/spec/rtems/task/req/exit.yml
@@ -348,7 +348,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqExit_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void Signal( rtems_signal_set signals )
   {
diff --git a/spec/rtems/task/req/mode.yml b/spec/rtems/task/req/mode.yml
index 58914f3d..7a767f69 100644
--- a/spec/rtems/task/req/mode.yml
+++ b/spec/rtems/task/req/mode.yml
@@ -562,7 +562,7 @@ test-support: |
 
   #define EVENT_TIMESLICE RTEMS_EVENT_1
 
-  typedef RtemsTaskReqMode_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void Worker( rtems_task_argument arg )
   {
diff --git a/spec/rtems/task/req/restart.yml b/spec/rtems/task/req/restart.yml
index 05c3171d..ed6cbf67 100644
--- a/spec/rtems/task/req/restart.yml
+++ b/spec/rtems/task/req/restart.yml
@@ -899,7 +899,7 @@ test-support: |
 
   #define UNSET_ARGUMENT 1
 
-  typedef RtemsTaskReqRestart_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void PrepareRealPriority( Context *ctx )
   {
diff --git a/spec/rtems/task/req/set-scheduler.yml b/spec/rtems/task/req/set-scheduler.yml
index 94e9ff6b..9212ea70 100644
--- a/spec/rtems/task/req/set-scheduler.yml
+++ b/spec/rtems/task/req/set-scheduler.yml
@@ -558,7 +558,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqSetScheduler_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   #define EVENT_OBTAIN_MUTEX_A RTEMS_EVENT_0
 
diff --git a/spec/rtems/task/req/start.yml b/spec/rtems/task/req/start.yml
index 74c9bf54..a316d3b5 100644
--- a/spec/rtems/task/req/start.yml
+++ b/spec/rtems/task/req/start.yml
@@ -309,13 +309,13 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqStart_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void WorkerA( rtems_task_argument arg )
   {
     Context *ctx;
 
-    ctx = &RtemsTaskReqStart_Instance;
+    ctx = &${.:/test-context-instance};
 
     while ( true ) {
       ctx->actual_argument += arg;
@@ -328,7 +328,7 @@ test-support: |
   {
     Context *ctx;
 
-    ctx = &RtemsTaskReqStart_Instance;
+    ctx = &${.:/test-context-instance};
 
     while ( true ) {
       ctx->actual_argument += arg;
@@ -341,7 +341,7 @@ test-support: |
     (void) executing;
     (void) started;
 
-    ++RtemsTaskReqStart_Instance.start_extension_calls;
+    ++${.:/test-context-instance}.start_extension_calls;
   }
 
   static const rtems_extensions_table extensions = {
diff --git a/spec/rtems/task/req/wake-after.yml b/spec/rtems/task/req/wake-after.yml
index ee7e9ee7..d23bf926 100644
--- a/spec/rtems/task/req/wake-after.yml
+++ b/spec/rtems/task/req/wake-after.yml
@@ -181,7 +181,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqWakeAfter_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void Worker( rtems_task_argument arg )
   {
diff --git a/spec/rtems/task/req/wake-when.yml b/spec/rtems/task/req/wake-when.yml
index 2551d3ba..366baa61 100644
--- a/spec/rtems/task/req/wake-when.yml
+++ b/spec/rtems/task/req/wake-when.yml
@@ -211,7 +211,7 @@ test-setup:
   description: null
 test-stop: null
 test-support: |
-  typedef RtemsTaskReqWakeWhen_Context Context;
+  typedef ${.:/test-context-type} Context;
 
   static void SetTOD( rtems_time_of_day *tod, uint32_t year )
   {