Merge pull request #13253 from LDong-Arm/unittests_any_dir

adbridge · web-flow · commit 29ca32e02549 · 2020-07-17T10:45:39.000+01:00
Allow unit tests defined anywhere in mbed-os
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
   )
 

Original file line number	Diff line number	Diff line change
`@@ -152,7 +152,7 @@ set(TEST_SUITES)`
`152`	`152`
`153`	`153`	`# Get all matched tests.`
`154`	`154`	`file(GLOB_RECURSE unittest-file-list`
`155`		`- "unittest.cmake"`
	`155`	`+ "../unittest.cmake" # matches any ../**/unittest.cmake`
`156`	`156`	`)`
`157`	`157`
`158`	`158`	`if ("${unittest-file-list}" STREQUAL "")`
`@@ -178,7 +178,7 @@ foreach(testfile ${unittest-file-list})`
`178`	`178`
`179`	`179`	`file(RELATIVE_PATH`
`180`	`180`	`TEST_SUITE_NAME # output`
`181`		`- ${PROJECT_SOURCE_DIR} # root`
	`181`	`+ "${PROJECT_SOURCE_DIR}/.." # root`
`182`	`182`	`${TEST_SUITE_DIR} #abs dirpath`
`183`	`183`	`)`
`184`	`184`