michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Get unit tests passing CI again

Browse source 
The following commit:

commit 407b49b35c (refs/bisect/bad)
Author: Torsten Rasmussen <Torsten.Rasmussen@nordicsemi.no>
Date:   Wed Feb 12 15:00:46 2020 +0100

    cmake: use find_package to locate Zephyr

breaks as we don't find the ZephyrUnittest package.  For now revert to
the old means until a proper fix can be made.

Signed-off-by: Kumar Gala <kumar.gala@linaro.org>
This commit is contained in:
Kumar Gala 2020-03-27 13:19:39 -05:00 • committed by Kumar Gala
commit 1bf839809c
10 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/unit/base64/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(base64) project(base64)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/crc/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(crc) project(crc)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/intmath/CMakeLists.txt
View file

@ -4,4 +4,4 @@ project(base64)
set(SOURCES set(SOURCES
main.c main.c
) )
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/list/CMakeLists.txt
View file

@ -7,4 +7,4 @@ set(SOURCES
dlist.c dlist.c
sflist.c sflist.c
) )
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/math_extras/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(math_extras) project(math_extras)
set(SOURCES main.c portable.c) set(SOURCES main.c portable.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/rbtree/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(rbtree) project(rbtree)
set(SOURCES main.c) set(SOURCES main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/timeutil/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(timeutil) project(timeutil)
set(SOURCES main.c test_gmtime.c test_s32.c test_s64.c) set(SOURCES main.c test_gmtime.c test_s32.c test_s64.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/unit/util/CMakeLists.txt
View file

@ -2,4 +2,4 @@
project(util) project(util)
set(SOURCES main.c ../../../lib/os/dec.c) set(SOURCES main.c ../../../lib/os/dec.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)

2
tests/ztest/base/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
if(BOARD STREQUAL unit_testing) if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main.c) list(APPEND SOURCES src/main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
project(base) project(base)
else() else()
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})

2
tests/ztest/mock/CMakeLists.txt
View file

@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1)
if(BOARD STREQUAL unit_testing) if(BOARD STREQUAL unit_testing)
list(APPEND SOURCES src/main.c) list(APPEND SOURCES src/main.c)
find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake)
project(mock) project(mock)
else() else()
find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})