Skip to content

Conversation

@gchwier
Copy link
Contributor

@gchwier gchwier commented Nov 22, 2024

Cherry-picked from upstream.
PR: zephyrproject-rtos/zephyr#81465

Extended hardware map to share a single board between variants. To run tests for different variants on the same board without re-configuring the hardware map file for each variant, one can extend the platform attribute with board names separated by spaces or use platform as a list.

@gchwier gchwier force-pushed the grch-share-variants branch from 447947d to e966840 Compare November 22, 2024 14:01
@gchwier
Copy link
Contributor Author

gchwier commented Nov 22, 2024

Rebased and cherry-picked comit from PR: zephyrproject-rtos/zephyr#79578
to fix blackbox tests.

@gchwier
Copy link
Contributor Author

gchwier commented Nov 26, 2024

@PerMac please review.
Here is one problem with compliance check - pylint issue with importing module in twister blackbox tests. This issue does not appear in the Upstream, probable something is wrong with configuration. This is minor issue. I can remove that commit with twister blackbox fix, but then we will have a failed blackbox test.

@PerMac
Copy link
Contributor

PerMac commented Nov 26, 2024

@carlescufi As Grzegorz wrote, It seems we won't pass compliance on this. Can you merge it without it? It is useful for hw setups testing multiple variants of our boards

@gchwier gchwier force-pushed the grch-share-variants branch from 91a2746 to 986f2f9 Compare November 26, 2024 15:42
@gchwier
Copy link
Contributor Author

gchwier commented Nov 27, 2024

@carlescufi to fix issue with pylint, we can add line
# pylint: disable=no-name-in-module in test_coverage.py file.
It is added in Upstream with that commit:
zephyrproject-rtos/zephyr@abfeb6a
however, we do not want to cherry-pick that one, because there are other not related changes (better to wait and pick it with next upmerge)

@gchwier gchwier force-pushed the grch-share-variants branch 2 times, most recently from ab38acf to 7e1d176 Compare November 28, 2024 13:28
@gchwier
Copy link
Contributor Author

gchwier commented Nov 28, 2024

Rebased and cherry-picked fix for blackbox tests

gchwier and others added 3 commits November 29, 2024 10:21
Extended hardware map to share a single board between variants.
To run tests for different variants on the same board
without re-configuring the hardware map file for each variant,
one can use a `platform` atribute as a list of names.

Signed-off-by: Grzegorz Chwierut <[email protected]>
(cherry picked from commit e0bd7e7)
Fix the expected pattern randomly matched to coverage.json contents
ordered differently at test_coverage_basedir().

Signed-off-by: Dmitrii Golovanov <[email protected]>
(cherry picked from commit 27456ed)
No need to pull babblesim and nrf_hw_models when doing twister testing.

Signed-off-by: Anas Nashif <[email protected]>
(cherry picked from commit cfd5469)
@gchwier gchwier force-pushed the grch-share-variants branch from 7e1d176 to 4d4e674 Compare November 29, 2024 09:22
@carlescufi carlescufi merged commit b476270 into nrfconnect:main Nov 29, 2024
20 of 21 checks passed
@gchwier gchwier deleted the grch-share-variants branch November 29, 2024 13:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants