[rtems-central commit] spec: Avoid name conflicts with test support
Sebastian Huber
sebh at rtems.org
Fri May 7 06:00:30 UTC 2021
Module: rtems-central
Branch: master
Commit: 441319db486bb55e8d346679cb13a84fd70562c4
Changeset: http://git.rtems.org/rtems-central/commit/?id=441319db486bb55e8d346679cb13a84fd70562c4
Author: Sebastian Huber <sebastian.huber at embedded-brains.de>
Date: Thu May 6 08:30:59 2021 +0200
spec: Avoid name conflicts with test support
---
spec/rtems/sem/req/release.yml | 16 ++++++++--------
spec/rtems/sem/req/set-priority.yml | 10 +++++-----
2 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/spec/rtems/sem/req/release.yml b/spec/rtems/sem/req/release.yml
index a55ad56..31abb7f 100644
--- a/spec/rtems/sem/req/release.yml
+++ b/spec/rtems/sem/req/release.yml
@@ -559,7 +559,7 @@ test-setup:
);
T_rsc_success( sc );
- SetScheduler(
+ SetWorkerScheduler(
ctx,
HELPER_OTHER,
ctx->other_scheduler_id,
@@ -637,7 +637,7 @@ test-support: |
}
#if defined(RTEMS_SMP)
- static void SetScheduler(
+ static void SetWorkerScheduler(
const Context *ctx,
WorkerKind worker,
rtems_id scheduler_id,
@@ -677,13 +677,13 @@ test-support: |
static void BlockMrsP( Context *ctx )
{
if ( CanUseThirdScheduler() ) {
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_A,
ctx->third_scheduler_id,
PRIO_HIGH
);
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_C,
ctx->third_scheduler_id,
@@ -805,7 +805,7 @@ test-support: |
#if defined(RTEMS_SMP)
if ( !IsPrioCeiling( ctx ) ) {
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_B,
ctx->other_scheduler_id,
@@ -911,13 +911,13 @@ test-support: |
#if defined(RTEMS_SMP)
if ( IsMrsP( ctx ) ) {
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_A,
ctx->runner_scheduler_id,
PRIO_HIGH
);
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_C,
ctx->runner_scheduler_id,
@@ -932,7 +932,7 @@ test-support: |
#if defined(RTEMS_SMP)
if ( !IsPrioCeiling( ctx ) ) {
- SetScheduler(
+ SetWorkerScheduler(
ctx,
BLOCKER_B,
ctx->runner_scheduler_id,
diff --git a/spec/rtems/sem/req/set-priority.yml b/spec/rtems/sem/req/set-priority.yml
index f86e32e..ae1eb9d 100644
--- a/spec/rtems/sem/req/set-priority.yml
+++ b/spec/rtems/sem/req/set-priority.yml
@@ -413,7 +413,7 @@ test-support: |
T_rsc_success( sc );
}
- static void SetScheduler( rtems_id scheduler_id )
+ static void ChangeScheduler( rtems_id scheduler_id )
{
#if defined(RTEMS_SMP)
rtems_status_code sc;
@@ -433,7 +433,7 @@ test-support: |
{
rtems_status_code sc;
- SetScheduler( scheduler_id );
+ ChangeScheduler( scheduler_id );
sc = rtems_semaphore_obtain(
ctx->the_semaphore_id,
@@ -445,7 +445,7 @@ test-support: |
T_eq_u32( GetSelfPriority(), priority );
ReleaseSemaphore( ctx );
- SetScheduler( ctx->runner_scheduler_id );
+ ChangeScheduler( ctx->runner_scheduler_id );
}
static void CheckNotDefined(
@@ -456,7 +456,7 @@ test-support: |
#if defined(RTEMS_SMP)
rtems_status_code sc;
- SetScheduler( scheduler_id );
+ ChangeScheduler( scheduler_id );
sc = rtems_semaphore_obtain(
ctx->the_semaphore_id,
@@ -465,7 +465,7 @@ test-support: |
);
T_rsc( sc, RTEMS_NOT_DEFINED );
- SetScheduler( ctx->runner_scheduler_id );
+ ChangeScheduler( ctx->runner_scheduler_id );
#else
(void) ctx;
(void) scheduler_id;
More information about the vc
mailing list