From 1bf839809c213eba88e8fd3a821095ca1f1e761a Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Fri, 27 Mar 2020 13:19:39 -0500 Subject: [PATCH] cmake: Get unit tests passing CI again The following commit: commit 407b49b35c111042ce474785bb88760322b26f32 (refs/bisect/bad) Author: Torsten Rasmussen 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 --- tests/unit/base64/CMakeLists.txt | 2 +- tests/unit/crc/CMakeLists.txt | 2 +- tests/unit/intmath/CMakeLists.txt | 2 +- tests/unit/list/CMakeLists.txt | 2 +- tests/unit/math_extras/CMakeLists.txt | 2 +- tests/unit/rbtree/CMakeLists.txt | 2 +- tests/unit/timeutil/CMakeLists.txt | 2 +- tests/unit/util/CMakeLists.txt | 2 +- tests/ztest/base/CMakeLists.txt | 2 +- tests/ztest/mock/CMakeLists.txt | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unit/base64/CMakeLists.txt b/tests/unit/base64/CMakeLists.txt index f13c212d3fc..9ae79204ee7 100644 --- a/tests/unit/base64/CMakeLists.txt +++ b/tests/unit/base64/CMakeLists.txt @@ -2,4 +2,4 @@ project(base64) set(SOURCES main.c) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/crc/CMakeLists.txt b/tests/unit/crc/CMakeLists.txt index 70babfa9657..1861e04ff63 100644 --- a/tests/unit/crc/CMakeLists.txt +++ b/tests/unit/crc/CMakeLists.txt @@ -2,4 +2,4 @@ project(crc) set(SOURCES main.c) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/intmath/CMakeLists.txt b/tests/unit/intmath/CMakeLists.txt index 88118230c13..0a6c9fc90c1 100644 --- a/tests/unit/intmath/CMakeLists.txt +++ b/tests/unit/intmath/CMakeLists.txt @@ -4,4 +4,4 @@ project(base64) set(SOURCES main.c ) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/list/CMakeLists.txt b/tests/unit/list/CMakeLists.txt index 11246ff7201..902723352c1 100644 --- a/tests/unit/list/CMakeLists.txt +++ b/tests/unit/list/CMakeLists.txt @@ -7,4 +7,4 @@ set(SOURCES dlist.c sflist.c ) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/math_extras/CMakeLists.txt b/tests/unit/math_extras/CMakeLists.txt index 265e822a9a3..50c03484622 100644 --- a/tests/unit/math_extras/CMakeLists.txt +++ b/tests/unit/math_extras/CMakeLists.txt @@ -2,4 +2,4 @@ project(math_extras) set(SOURCES main.c portable.c) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/rbtree/CMakeLists.txt b/tests/unit/rbtree/CMakeLists.txt index 13ff70f7fe5..c9ae2f24874 100644 --- a/tests/unit/rbtree/CMakeLists.txt +++ b/tests/unit/rbtree/CMakeLists.txt @@ -2,4 +2,4 @@ project(rbtree) set(SOURCES main.c) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/unit/timeutil/CMakeLists.txt b/tests/unit/timeutil/CMakeLists.txt index d4478116413..abfe242b30e 100644 --- a/tests/unit/timeutil/CMakeLists.txt +++ b/tests/unit/timeutil/CMakeLists.txt @@ -2,4 +2,4 @@ project(timeutil) 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) diff --git a/tests/unit/util/CMakeLists.txt b/tests/unit/util/CMakeLists.txt index 03f4dad0cfb..213c8c39cec 100644 --- a/tests/unit/util/CMakeLists.txt +++ b/tests/unit/util/CMakeLists.txt @@ -2,4 +2,4 @@ project(util) set(SOURCES main.c ../../../lib/os/dec.c) -find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) +include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) diff --git a/tests/ztest/base/CMakeLists.txt b/tests/ztest/base/CMakeLists.txt index 5ab8318da66..3b1f2c171ab 100644 --- a/tests/ztest/base/CMakeLists.txt +++ b/tests/ztest/base/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) if(BOARD STREQUAL unit_testing) list(APPEND SOURCES src/main.c) - find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) project(base) else() find_package(Zephyr HINTS $ENV{ZEPHYR_BASE}) diff --git a/tests/ztest/mock/CMakeLists.txt b/tests/ztest/mock/CMakeLists.txt index 0a61863e0d0..2bed6663650 100644 --- a/tests/ztest/mock/CMakeLists.txt +++ b/tests/ztest/mock/CMakeLists.txt @@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.13.1) if(BOARD STREQUAL unit_testing) list(APPEND SOURCES src/main.c) - find_package(ZephyrUnittest HINTS $ENV{ZEPHYR_BASE}) + include($ENV{ZEPHYR_BASE}/subsys/testsuite/unittest.cmake) project(mock) else() find_package(Zephyr HINTS $ENV{ZEPHYR_BASE})