RIOT
RIOT copied to clipboard
boards/common/makefiles/stdio_cdc_acm.dep.mk: fix [backport 2024.01]
Backport of #20379
Contribution description
This fixes compilation issues in tests/pkg/tinyusb_netdev
with newer versions of the RISC-V toolchain due to two competing USB stacks being pulled in. With the older toolchain the build system warns:
The following features may conflict: periph_usbdev tinyusb_device
But builds fine (even though surprises at runtime are likely). The newer toolchain takes an issue with the same symbol being linked in more than once (and more than one instance not being weak
).
Testing procedure
make BOARD=seeedstudio-gd32 -C tests/pkg/tinyusb_netdev
should no longer pull in two USB stacks.
Issues/PRs references
None
Murdock results
:heavy_check_mark: PASSED
c186da6bd1b7df5edc049e77dcb6e0245c71409d tests/sys/timer_overhead: disable test on native in CI
Success | Failures | Total | Runtime |
---|---|---|---|
8613 | 0 | 8613 | 09m:31s |
Artifacts
I fear we will have to bundle this backport with the backport of https://github.com/RIOT-OS/RIOT/pull/20380 into one backport PR :/
This should now contain all the fixes needed to get past the CI
Maybe disabling all the flaky tests on native should also be backported. But for now, let's roll the dice again.
Just rerolling the dice until all of the flaky native and native64 tests succeed for both GNU and LLVM toolchain on the first run is unbearable.
We either have to also backport all those "disabling flake test in CI" PRs of lately, or revert https://github.com/RIOT-OS/RIOT/pull/20269 in the release branch to treat the native test failures as build failures and just re-run them up to three times.
Do you have a list of the tests to disable?
nvm I think I got it.
Yeah! Merging to the release branch works again :tada: