From 817ff8ed8f9b56ba214e7f165741d7f50c42bd57 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Wed, 8 Jul 2020 16:00:06 +0100 Subject: [PATCH 1/2] Allow unittest.cmake from the whole mbed-os --- UNITTESTS/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index b6b1d6b6af..9bbc6047b3 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -152,7 +152,7 @@ set(TEST_SUITES) # Get all matched tests. file(GLOB_RECURSE unittest-file-list - "unittest.cmake" + "../unittest.cmake" ) if ("${unittest-file-list}" STREQUAL "") @@ -178,7 +178,7 @@ foreach(testfile ${unittest-file-list}) file(RELATIVE_PATH TEST_SUITE_NAME # output - ${PROJECT_SOURCE_DIR} # root + "${PROJECT_SOURCE_DIR}/.." # root ${TEST_SUITE_DIR} #abs dirpath ) From a884f1ad439d362ec535ff090afe048d60bbd2b6 Mon Sep 17 00:00:00 2001 From: Lingkai Dong Date: Wed, 8 Jul 2020 16:28:56 +0100 Subject: [PATCH 2/2] UNITTESTS: Add comment for glob pattern --- UNITTESTS/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UNITTESTS/CMakeLists.txt b/UNITTESTS/CMakeLists.txt index 9bbc6047b3..3c63f55c16 100644 --- a/UNITTESTS/CMakeLists.txt +++ b/UNITTESTS/CMakeLists.txt @@ -152,7 +152,7 @@ set(TEST_SUITES) # Get all matched tests. file(GLOB_RECURSE unittest-file-list - "../unittest.cmake" + "../unittest.cmake" # matches any ../**/unittest.cmake ) if ("${unittest-file-list}" STREQUAL "")