validation: Fix handling of N/A pre-conditions

In the action requirements, some pre-conditions are not applicable
depending on the state of other pre-conditions.  There is no particular
order in the pre-conditions, so we have to check the N/A status
individually.

1 files changed, 3 insertions, 12 deletions

diff --git a/testsuites/validation/tc-barrier-delete.c b/testsuites/validation/tc-barrier-delete.c
index 1655ff1b2f..1402ff4fcf 100644
--- a/testsuites/validation/tc-barrier-delete.c
+++ b/testsuites/validation/tc-barrier-delete.c
@@ -407,7 +407,6 @@ static inline RtemsBarrierReqDelete_Entry RtemsBarrierReqDelete_GetEntry(
 T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
 {
   RtemsBarrierReqDelete_Context *ctx;
-  RtemsBarrierReqDelete_Entry entry;
   size_t index;
 
   ctx = T_fixture_context();
@@ -419,17 +418,10 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
     ctx->pcs[ 0 ] < RtemsBarrierReqDelete_Pre_Id_NA;
     ++ctx->pcs[ 0 ]
   ) {
-    entry = RtemsBarrierReqDelete_GetEntry( index );
-
-    if ( entry.Pre_Id_NA ) {
-      ctx->pcs[ 0 ] = RtemsBarrierReqDelete_Pre_Id_NA;
-      index += ( RtemsBarrierReqDelete_Pre_Id_NA - 1 );
-    }
+    RtemsBarrierReqDelete_Entry entry;
 
-    if ( entry.Skip ) {
-      ++index;
-      continue;
-    }
+    entry = RtemsBarrierReqDelete_GetEntry( index );
+    ++index;
 
     RtemsBarrierReqDelete_Prepare( ctx );
     RtemsBarrierReqDelete_Pre_Id_Prepare( ctx, ctx->pcs[ 0 ] );
@@ -438,7 +430,6 @@ T_TEST_CASE_FIXTURE( RtemsBarrierReqDelete, &RtemsBarrierReqDelete_Fixture )
     RtemsBarrierReqDelete_Post_Name_Check( ctx, entry.Post_Name );
     RtemsBarrierReqDelete_Post_Flush_Check( ctx, entry.Post_Flush );
     RtemsBarrierReqDelete_Cleanup( ctx );
-    ++index;
   }
 }