Skip to content

tests/periph/selftest_shield: timer allocation conflict#20096

Merged
maribu merged 1 commit intoRIOT-OS:masterfrom
maribu:tests/periph/selftest_shield
Nov 21, 2023
Merged

tests/periph/selftest_shield: timer allocation conflict#20096
maribu merged 1 commit intoRIOT-OS:masterfrom
maribu:tests/periph/selftest_shield

Conversation

@maribu
Copy link
Copy Markdown
Member

@maribu maribu commented Nov 20, 2023

Contribution description

  • Detect when the same timer is used by ztimer (pulled in as dependency for a peripheral driver, e.g. periph_adc on STM32F3) and the test application
  • Try to provide a better default (e.g. TIMER_DEV(1) when ztimer_periph_timer is in use, TIMER_DEV(0) otherwise)

Testing procedure

  • Run the app on the nucleo-f303re in master: A hard fault is triggered during adc_init() due to a conflict in the use of the same periph_timer peripheral by the app and ztimer
  • In this branch, the test will no longer hard fault, but rather fail to do timer_init() failing (because the board only has a single timer peripheral exposed)

Issues/PRs references

None

@maribu maribu added Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors) Area: tests Area: tests and testing framework Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 20, 2023
@riot-ci
Copy link
Copy Markdown

riot-ci commented Nov 20, 2023

Murdock results

✔️ PASSED

57488a5 tests/periph/selftest_shield: timer allocation conflict

Success Failures Total Runtime
2 0 2 01m:10s

Artifacts

- Detect when the same timer is used by `ztimer` (pulled in as
  dependency for a peripheral driver, e.g. `periph_adc` on STM32F3) and
  the test application
- Try to provide a better default (e.g. `TIMER_DEV(1)` when
  `ztimer_periph_timer` is in use, `TIMER_DEV(0)` otherwise)
@maribu maribu force-pushed the tests/periph/selftest_shield branch from 3197578 to 57488a5 Compare November 20, 2023 16:17
@maribu maribu added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Nov 20, 2023
@maribu maribu added this pull request to the merge queue Nov 21, 2023
Merged via the queue into RIOT-OS:master with commit 4232fea Nov 21, 2023
@maribu maribu deleted the tests/periph/selftest_shield branch November 21, 2023 05:10
@maribu
Copy link
Copy Markdown
Member Author

maribu commented Nov 21, 2023

Thx :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: tests Area: tests and testing framework CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer Type: bug The issue reports a bug / The PR fixes a bug (including spelling errors)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants