summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Kühndel <frank.kuehndel@embedded-brains.de>2021-10-06 15:15:54 +0200
committerSebastian Huber <sebastian.huber@embedded-brains.de>2021-10-08 16:10:12 +0200
commitd1a02a2e7059f840635e90bb6677e54ecda6f537 (patch)
tree904c82a1e67f7cc4535677ec22ad5e31c65c4fbf
parentspec: Refine TQ timeout priority inherit spec (diff)
downloadrtems-central-d1a02a2e7059f840635e90bb6677e54ecda6f537.tar.bz2
spec: Ratemon test: Adapt to reset postponed jobs
There was a change by which rtems_rate_monotonic_cancel() sets the postponed jobs counter 0. This patch adapts the tests to this new behavior. https://git.rtems.org/rtems/commit/?id=38c2147759d1b687a7330419a04a6c84d80b784a
-rw-r--r--spec/rtems/ratemon/req/cancel.yml18
-rw-r--r--spec/rtems/ratemon/req/period.yml3
2 files changed, 3 insertions, 18 deletions
diff --git a/spec/rtems/ratemon/req/cancel.yml b/spec/rtems/ratemon/req/cancel.yml
index 26aafd21..ecfaef34 100644
--- a/spec/rtems/ratemon/req/cancel.yml
+++ b/spec/rtems/ratemon/req/cancel.yml
@@ -56,21 +56,6 @@ post-conditions:
text: |
There shall be no ${../glossary/postponedjob:/plural}
after the return of the ${../if/cancel:/name} call.
- - name: One
- test-code: |
- T_eq_u32( ctx->period_status.postponed_jobs_count, 1 );
- text: |
- The number of ${../glossary/postponedjob:/plural} shall not be
- changed by the past call to ${../if/cancel:/name}.
- - name: Several
- test-code: |
- T_eq_u32(
- ctx->period_status.postponed_jobs_count,
- ctx->postponed_jobs_count
- );
- text: |
- The number of ${../glossary/postponedjob:/plural} shall not be
- changed by the past call to ${../if/cancel:/name}.
- name: Nop
test-code: |
T_eq_u32( ctx->period_status.postponed_jobs_count,
@@ -447,8 +432,7 @@ transition-map:
post-conditions:
Status: Ok
State: Inactive
- Postponed:
- - specified-by: Postponed
+ Postponed: Zero
Scheduler: Called
pre-conditions:
Id:
diff --git a/spec/rtems/ratemon/req/period.yml b/spec/rtems/ratemon/req/period.yml
index 7d5674f3..e5f1276c 100644
--- a/spec/rtems/ratemon/req/period.yml
+++ b/spec/rtems/ratemon/req/period.yml
@@ -259,6 +259,7 @@ pre-conditions:
- name: New
test-code: |
/* Nothing to do here as the period is newly created. */
+ ctx->postponed_jobs_count = 0;
text: |
While ${../if/period:/name} has never been invoked with result
${../../status/if/successful:/name} on the period object referenced
@@ -271,6 +272,7 @@ pre-conditions:
TickTheClock( ctx, ctx->postponed_jobs_count * period_length );
}
OwnerDoWork( ctx, CancelPeriod );
+ ctx->postponed_jobs_count = 0;
text: |
While ${../if/period:/name} has never been invoked with result
${../../status/if/successful:/name} on the period object referenced
@@ -425,7 +427,6 @@ test-prepare: |
&period_status
);
T_rsc_success( status );
- ctx->postponed_jobs_count = period_status.postponed_jobs_count;
test-setup:
brief: null
code: |