diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-05-06 08:30:59 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2021-05-06 08:31:34 +0200 |
commit | 441319db486bb55e8d346679cb13a84fd70562c4 (patch) | |
tree | 064ef4f5c2a430fbc44f390fdbd3cc2b9e00136d | |
parent | validation: Fix remove duplicate pre-conds (diff) | |
download | rtems-central-441319db486bb55e8d346679cb13a84fd70562c4.tar.bz2 |
spec: Avoid name conflicts with test support
-rw-r--r-- | spec/rtems/sem/req/release.yml | 16 | ||||
-rw-r--r-- | 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 a55ad56f..31abb7f5 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 f86e32e5..ae1eb9d4 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; |