Commit 1497104d authored by Torsten Rasmussen's avatar Torsten Rasmussen Committed by Carles Cufi
Browse files

unittest: update unittest to hwmv2 

Follow-up: fe25709a 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: default avatarTorsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
parent fd772f8e

cmake/modules/unittest.cmake

+6 −3
Changes for cmake/modules/unittest.cmake: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -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)

scripts/pylib/twister/twisterlib/environment.py

+1 −1
Changes for scripts/pylib/twister/twisterlib/environment.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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:

scripts/pylib/twister/twisterlib/testplan.py

+1 −1
Changes for scripts/pylib/twister/twisterlib/testplan.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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)

subsys/testsuite/arch/archs.yml

0 → 100644
+3 −0
Changes for subsys/testsuite/arch/archs.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line 
archs:

  - name: unit_testing

    path: unit_testing

CRA Git | Maintained and supported by SUSTech CRA and CCSE