spec: Test thread queue API change

9 files changed, 15 insertions, 13 deletions

diff --git a/spec/rtems/message/req/receive.yml b/spec/rtems/message/req/receive.yml
index a2918954..6cbf78b6 100644
--- a/spec/rtems/message/req/receive.yml
+++ b/spec/rtems/message/req/receive.yml
@@ -488,7 +488,7 @@ test-setup:
     memset( ctx, 0, sizeof( *ctx ) );
     ctx->magic                  = magic;
     ctx->tq_ctx.enqueue         = ReceiveMsg;
-    ctx->tq_ctx.surrender       = TQDoNothing;
+    ctx->tq_ctx.surrender       = TQDoNothingSuccessfully;
     ctx->tq_ctx.convert_status  = TQConvertStatusClassic;
     ctx->tq_ctx.enqueue_prepare = EnqueuePrepare;
     ctx->tq_ctx.enqueue_done    = EnqueueDone;
diff --git a/spec/rtems/sem/req/flush.yml b/spec/rtems/sem/req/flush.yml
index 76a3d37c..1c6a3968 100644
--- a/spec/rtems/sem/req/flush.yml
+++ b/spec/rtems/sem/req/flush.yml
@@ -74,7 +74,7 @@ pre-conditions:
       ctx->attribute_set |= RTEMS_BINARY_SEMAPHORE;
       ctx->initial_count = 1;
       ctx->tq_ctx.enqueue_prepare = EnqueuePrepare;
-      ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+      ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     text: |
       While the semaphore object is a binary semaphore.
   - name: PrioCeiling
@@ -82,7 +82,7 @@ pre-conditions:
       ctx->attribute_set |= RTEMS_BINARY_SEMAPHORE | RTEMS_PRIORITY_CEILING;
       ctx->initial_count = 1;
       ctx->tq_ctx.enqueue_prepare = EnqueuePrepare;
-      ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+      ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     text: |
       While the semaphore object is a priority ceiling semaphore.
   - name: PrioInherit
@@ -90,7 +90,7 @@ pre-conditions:
       ctx->attribute_set |= RTEMS_BINARY_SEMAPHORE | RTEMS_INHERIT_PRIORITY;
       ctx->initial_count = 1;
       ctx->tq_ctx.enqueue_prepare = EnqueuePrepare;
-      ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+      ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     text: |
       While the semaphore object is a priority inheritance semaphore.
   - name: MrsP
@@ -99,7 +99,7 @@ pre-conditions:
         RTEMS_MULTIPROCESSOR_RESOURCE_SHARING;
       ctx->initial_count = 1;
       ctx->tq_ctx.enqueue_prepare = EnqueuePrepare;
-      ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+      ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     text: |
       While the semaphore object is a MrsP semaphore.
   test-epilogue: null
@@ -199,7 +199,7 @@ test-setup:
     memset( ctx, 0, sizeof( *ctx ) );
     ctx->tq_ctx.enqueue = Enqueue;
     ctx->tq_ctx.flush = Flush;
-    ctx->tq_ctx.surrender = TQDoNothing;
+    ctx->tq_ctx.surrender = TQSurrenderClassicSem;
     ctx->tq_ctx.convert_status = TQConvertStatusClassic;
     TQInitialize( &ctx->tq_ctx );
   description: null
diff --git a/spec/rtems/sem/req/obtain.yml b/spec/rtems/sem/req/obtain.yml
index 2e0a3b34..2086c561 100644
--- a/spec/rtems/sem/req/obtain.yml
+++ b/spec/rtems/sem/req/obtain.yml
@@ -269,7 +269,7 @@ test-setup:
   code: |
     memset( ctx, 0, sizeof( *ctx ) );
     ctx->tq_ctx.enqueue_prepare = TQEnqueuePrepareDefault;
-    ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+    ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     ctx->tq_ctx.enqueue = TQEnqueueClassicSem;
     ctx->tq_ctx.surrender = TQSurrenderClassicSem;
     ctx->tq_ctx.get_owner = TQGetOwnerClassicSem;
diff --git a/spec/rtems/sem/req/timeout.yml b/spec/rtems/sem/req/timeout.yml
index 30303432..5a31fa6a 100644
--- a/spec/rtems/sem/req/timeout.yml
+++ b/spec/rtems/sem/req/timeout.yml
@@ -141,7 +141,7 @@ test-setup:
     memset( ctx, 0, sizeof( *ctx ) );
     ctx->tq_ctx.wait = TQ_WAIT_TIMED;
     ctx->tq_ctx.enqueue_prepare = TQEnqueuePrepareDefault;
-    ctx->tq_ctx.enqueue_done = TQSurrenderClassicSem;
+    ctx->tq_ctx.enqueue_done = TQEnqueueDoneDefault;
     ctx->tq_ctx.enqueue = TQEnqueueClassicSem;
     ctx->tq_ctx.surrender = TQSurrenderClassicSem;
     ctx->tq_ctx.convert_status = TQConvertStatusClassic;
diff --git a/spec/score/futex/req/wait.yml b/spec/score/futex/req/wait.yml
index 0f06eeed..cd12e1bd 100644
--- a/spec/score/futex/req/wait.yml
+++ b/spec/score/futex/req/wait.yml
@@ -108,7 +108,7 @@ test-setup:
     ctx->tq_ctx.enqueue_prepare = TQDoNothing;
     ctx->tq_ctx.enqueue = Enqueue;
     ctx->tq_ctx.enqueue_done = EnqueueDone;
-    ctx->tq_ctx.surrender = TQDoNothing;
+    ctx->tq_ctx.surrender = TQDoNothingSuccessfully;
     ctx->tq_ctx.convert_status = TQConvertStatusPOSIX;
     TQInitialize( &ctx->tq_ctx );
   description: null
diff --git a/spec/score/futex/req/wake.yml b/spec/score/futex/req/wake.yml
index aac9ad3e..c7d42656 100644
--- a/spec/score/futex/req/wake.yml
+++ b/spec/score/futex/req/wake.yml
@@ -112,7 +112,7 @@ test-setup:
     ctx->tq_ctx.enqueue = Enqueue;
     ctx->tq_ctx.enqueue_done = TQDoNothing;
     ctx->tq_ctx.flush = Flush;
-    ctx->tq_ctx.surrender = TQDoNothing;
+    ctx->tq_ctx.surrender = TQDoNothingSuccessfully;
     ctx->tq_ctx.convert_status = TQConvertStatusPOSIX;
     TQInitialize( &ctx->tq_ctx );
   description: null
diff --git a/spec/score/sem/req/seize-wait.yml b/spec/score/sem/req/seize-wait.yml
index cbb5297f..8df71d93 100644
--- a/spec/score/sem/req/seize-wait.yml
+++ b/spec/score/sem/req/seize-wait.yml
@@ -120,7 +120,7 @@ test-local-includes:
 - tr-tq-enqueue-priority.h
 test-prepare: |
   ctx->tq_ctx->base.enqueue_prepare = TQEnqueuePrepareDefault;
-  ctx->tq_ctx->base.enqueue_done = TQSurrenderClassicSem;
+  ctx->tq_ctx->base.enqueue_done = TQEnqueueDoneDefault;
   ctx->tq_ctx->base.get_properties = GetProperties;
 test-setup: null
 test-stop: null
diff --git a/spec/score/tq/req/enqueue-ceiling.yml b/spec/score/tq/req/enqueue-ceiling.yml
index 66dbe3e8..9d683931 100644
--- a/spec/score/tq/req/enqueue-ceiling.yml
+++ b/spec/score/tq/req/enqueue-ceiling.yml
@@ -205,7 +205,8 @@ test-action: |
   status = TQEnqueue( ctx->tq_ctx, TQ_WAIT_FOREVER );
   T_eq_int( status, TQConvertStatus( ctx->tq_ctx, STATUS_SUCCESSFUL ) );
   TQSchedulerRecordStop( ctx->tq_ctx );
-  TQSurrender( ctx->tq_ctx );
+  status = TQSurrender( ctx->tq_ctx );
+  T_eq_int( status, TQConvertStatus( ctx->tq_ctx, STATUS_SUCCESSFUL ) );
 
   if (
     ctx->priority != PRIO_PSEUDO_ISR &&
diff --git a/spec/score/tq/req/enqueue-mrsp.yml b/spec/score/tq/req/enqueue-mrsp.yml
index 376297ba..2708cab3 100644
--- a/spec/score/tq/req/enqueue-mrsp.yml
+++ b/spec/score/tq/req/enqueue-mrsp.yml
@@ -231,7 +231,8 @@ test-action: |
   );
 
   TQSchedulerRecordStart( ctx->tq_ctx );
-  TQSurrender( ctx->tq_ctx );
+  status = TQSurrender( ctx->tq_ctx );
+  T_eq_int( status, TQConvertStatus( ctx->tq_ctx, STATUS_SUCCESSFUL ) );
   TQWaitForDone( ctx->tq_ctx, TQ_BLOCKER_A );
 
   if ( CanDoFullValidation() ) {