unittest: update unittest to hwmv2
Follow-up: fe25709a9c twister: add unit_testing soc and board Moving the soc.yml and board.yml to subsys/testsuite tree. Introduce subsys/testsuite/arch/archs.yml with unit_testing arch. Update the Zephyr CMake module unittest.cmake to include HWMv2 and reorder includes to follow same order as zephyr_default.cmake. Signed-off-by: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
This commit is contained in:
parent
fd772f8e77
commit
1497104de4
|
@ -2,14 +2,17 @@
|
|||
|
||||
cmake_minimum_required(VERSION 3.20.0)
|
||||
|
||||
include(extensions)
|
||||
include(west)
|
||||
include(root)
|
||||
include(zephyr_module)
|
||||
include(boards)
|
||||
include(arch_v1)
|
||||
include(hwm_v2)
|
||||
include(configuration_files)
|
||||
|
||||
include(west)
|
||||
include(zephyr_module)
|
||||
include(kconfig)
|
||||
include(arch_v2)
|
||||
include(soc_v2)
|
||||
|
||||
find_package(TargetTools)
|
||||
|
||||
|
|
|
@ -242,7 +242,7 @@ Artificially long but functional example:
|
|||
# Start of individual args place them in alpha-beta order
|
||||
|
||||
board_root_list = ["%s/boards" % ZEPHYR_BASE,
|
||||
"%s/scripts/pylib/twister/boards" % ZEPHYR_BASE]
|
||||
"%s/subsys/testsuite/boards" % ZEPHYR_BASE]
|
||||
|
||||
modules = zephyr_module.parse_modules(ZEPHYR_BASE)
|
||||
for module in modules:
|
||||
|
|
|
@ -405,7 +405,7 @@ class TestPlan:
|
|||
# but in Zephyr build system, the board root is without the `boards` in folder path.
|
||||
board_roots = [Path(os.path.dirname(root)) for root in self.env.board_roots]
|
||||
lb_args = Namespace(arch_roots=[Path(ZEPHYR_BASE)], soc_roots=[Path(ZEPHYR_BASE),
|
||||
Path(ZEPHYR_BASE) / 'scripts' / 'pylib' / 'twister'],
|
||||
Path(ZEPHYR_BASE) / 'subsys' / 'testsuite'],
|
||||
board_roots=board_roots, board=None, board_dir=None)
|
||||
v1_boards = list_boards.find_boards(lb_args)
|
||||
v2_boards = list_boards.find_v2_boards(lb_args)
|
||||
|
|
3
subsys/testsuite/arch/archs.yml
Normal file
3
subsys/testsuite/arch/archs.yml
Normal file
|
@ -0,0 +1,3 @@
|
|||
archs:
|
||||
- name: unit_testing
|
||||
path: unit_testing
|
|
@ -6,3 +6,6 @@ config SOC_UNIT_TESTING
|
|||
bool "Unit testing SoC"
|
||||
help
|
||||
SoC for unit testing
|
||||
|
||||
config SOC
|
||||
default "unit_testing"
|
Loading…
Reference in a new issue