Commit 28edb220 authored by Alberto Escolar Piedras's avatar Alberto Escolar Piedras Committed by David Leach
Browse files

tests: Support targeting unit_testing with and without qualifier 



For tests that support both targeting unit_testing and
other targets, we check in the cmake code the BOARD variable.
Let's allow users to set this to either of unit_testing
or unit_testing/unit_testing so it behaves like for other
tests.

Signed-off-by: default avatarAlberto Escolar Piedras <alberto.escolar.piedras@nordicsemi.no>
parent 9ceeb9bf

tests/subsys/testsuite/fff_fake_contexts/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
# SPDX-License-Identifier: Apache-2.0



cmake_minimum_required(VERSION 3.20.0)

if(BOARD STREQUAL unit_testing/unit_testing)

if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")

  find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

  set(target testbinary)

else()

tests/ztest/base/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



cmake_minimum_required(VERSION 3.20.0)

if(BOARD STREQUAL unit_testing/unit_testing)

if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")

  find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

  project(base)

tests/ztest/fail/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
cmake_minimum_required(VERSION 3.20.0)

include(ExternalProject)



if(BOARD STREQUAL unit_testing/unit_testing)

if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")

  find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

  set(target testbinary)

  # Set the target binary for the 'core' external project. The path to this must match the one set

tests/ztest/fail/core/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ elseif(CONFIG_ZTEST_FAIL_TEST_UNEXPECTED_ASSUME) 
  list(APPEND test_sources src/unexpected_assume.cpp)

endif()



if(BOARD STREQUAL unit_testing/unit_testing)

if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")

  find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

  project(base)

tests/ztest/zexpect/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: Apache-2.0



cmake_minimum_required(VERSION 3.20.0)

if(BOARD STREQUAL unit_testing/unit_testing)

if(BOARD STREQUAL "unit_testing" OR BOARD STREQUAL "unit_testing/unit_testing")

  find_package(Zephyr COMPONENTS unittest REQUIRED HINTS $ENV{ZEPHYR_BASE})

  project(base)

CRA Git | Maintained and supported by SUSTech CRA and CCSE