1 files changed, 58 insertions, 8 deletions
diff --git a/testsuites/validation/tr-tq-timeout-priority-inherit.h b/testsuites/validation/tr-tq-timeout-priority-inherit.h
index 5e98c92cde..a75665f659 100644
--- a/testsuites/validation/tr-tq-timeout-priority-inherit.h
+++ b/testsuites/validation/tr-tq-timeout-priority-inherit.h
@@ -64,16 +64,52 @@ extern "C" {
  */
 
 typedef enum {
-  ScoreTqReqTimeoutPriorityInherit_Pre_EnqueueVariant_Blocking,
-  ScoreTqReqTimeoutPriorityInherit_Pre_EnqueueVariant_Sticky,
-  ScoreTqReqTimeoutPriorityInherit_Pre_EnqueueVariant_NA
-} ScoreTqReqTimeoutPriorityInherit_Pre_EnqueueVariant;
+  ScoreTqReqTimeoutPriorityInherit_Pre_HomeScheduler_Home,
+  ScoreTqReqTimeoutPriorityInherit_Pre_HomeScheduler_Helping,
+  ScoreTqReqTimeoutPriorityInherit_Pre_HomeScheduler_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_HomeScheduler;
 
 typedef enum {
-  ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler_Same,
-  ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler_Other,
-  ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler_NA
-} ScoreTqReqTimeoutPriorityInherit_Pre_Scheduler;
+  ScoreTqReqTimeoutPriorityInherit_Pre_EligibleScheduler_One,
+  ScoreTqReqTimeoutPriorityInherit_Pre_EligibleScheduler_More,
+  ScoreTqReqTimeoutPriorityInherit_Pre_EligibleScheduler_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_EligibleScheduler;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Only,
+  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Vital,
+  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_Dispensable,
+  ScoreTqReqTimeoutPriorityInherit_Pre_Queue_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_Queue;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Only,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Vital,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_Dispensable,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_OwnerPriority;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NotEnqueued,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_FIFO,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_Priority,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_PriorityInherit,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_OwnerState;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Only,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Vital,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_Dispensable,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_OwnerQueue;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Only,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Vital,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_Dispensable,
+  ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority_NA
+} ScoreTqReqTimeoutPriorityInherit_Pre_OwnerOwnerPriority;
 
 typedef enum {
   ScoreTqReqTimeoutPriorityInherit_Pre_WaitState_Blocked,
@@ -94,6 +130,20 @@ typedef enum {
   ScoreTqReqTimeoutPriorityInherit_Post_Unblock_NA
 } ScoreTqReqTimeoutPriorityInherit_Post_Unblock;
 
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Nop,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Lower,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_Drop,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority_NA
+} ScoreTqReqTimeoutPriorityInherit_Post_OwnerPriority;
+
+typedef enum {
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Nop,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Lower,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_Drop,
+  ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority_NA
+} ScoreTqReqTimeoutPriorityInherit_Post_OwnerOwnerPriority;
+
 /**
  * @brief Runs the parameterized test case.
  *