Merge pull request #13253 from LDong-Arm/unittests_any_dir

Allow unit tests defined anywhere in mbed-os
ARMmbed · Jul 17, 2020 · 29ca32e · 29ca32e
2 parents a2ada74 + a884f1a
commit 29ca32e
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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 "")
@@ -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
  )