Unit tests: Remove redundant CMake target mbed-headers-base

LDong-Arm · LDong-Arm · commit e399ebf18bea · 2021-07-16T16:00:20.000+01:00
Individual libraries' `target_h` stub headers have now all been moved
from `mbed-headers-base` to `mbed-headers-&lt;library&gt;`.

Note: Even though headers previously in `target_h` are technically
stubs/fakes too, they are used by not only unit tests but also regular
libraries when compiled for unit tests, because no target-specific HAL
implementation exists in this case. In order for regular library
sources to pick up `target_h` headers, those headers must

* have the same names as regular headers
* appear first in include paths

This is why those headers are part of `mbed-headers-&lt;library&gt;` and not
`mbed-stubs-&lt;library&gt;`. Before this refactoring, `mbed-headers-base`
was the first in unit tests' include paths.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -3,12 +3,10 @@
 
 add_library(mbed-stubs-headers INTERFACE)
 add_library(mbed-headers INTERFACE)
-add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-connectivity
         mbed-headers-drivers
@@ -17,17 +15,6 @@ target_link_libraries(mbed-headers
         mbed-headers-rtos
 )
 
-target_include_directories(mbed-headers-base
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/platform/cxxsupport
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/drivers
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos/include
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/rtos
-        ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
-)
-
 target_include_directories(mbed-headers-connectivity
     INTERFACE
         ${mbed-os_SOURCE_DIR}/connectivity
diff --git a/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/cellular/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -49,7 +49,6 @@ target_sources(mbed-stubs-cellular
 
 target_link_libraries(mbed-stubs-cellular
     PRIVATE
-        mbed-headers-base
         mbed-headers-connectivity
         mbed-stubs-platform
         mbed-headers-rtos
diff --git a/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt b/connectivity/lorawan/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -39,7 +39,6 @@ target_sources(mbed-stubs-lorawan
 
 target_link_libraries(mbed-stubs-lorawan
     PRIVATE
-        mbed-headers-base
         mbed-headers-events
         mbed-headers-hal
         mbed-stubs-headers
diff --git a/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt b/drivers/tests/UNITTESTS/PwmOut/CMakeLists.txt
@@ -18,7 +18,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-hal
         mbed-headers-drivers
diff --git a/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt b/drivers/tests/UNITTESTS/Watchdog/CMakeLists.txt
@@ -19,7 +19,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-drivers
         mbed-headers-platform
diff --git a/drivers/tests/UNITTESTS/doubles/CMakeLists.txt b/drivers/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -28,7 +28,6 @@ target_compile_definitions(mbed-stubs-drivers
 
 target_link_libraries(mbed-stubs-drivers
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-drivers
         mbed-headers-platform
diff --git a/events/tests/UNITTESTS/doubles/CMakeLists.txt b/events/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -32,7 +32,6 @@ target_include_directories(mbed-stubs-events
 
 target_link_libraries(mbed-stubs-events
     PRIVATE
-        mbed-headers-base
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
diff --git a/events/tests/UNITTESTS/equeue/CMakeLists.txt b/events/tests/UNITTESTS/equeue/CMakeLists.txt
@@ -23,7 +23,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-events
         mbed-stubs-events
diff --git a/hal/tests/UNITTESTS/doubles/CMakeLists.txt b/hal/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -28,7 +28,6 @@ target_sources(mbed-stubs-hal
 
 target_link_libraries(mbed-stubs-hal
     PRIVATE
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/platform/tests/UNITTESTS/doubles/CMakeLists.txt b/platform/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -39,7 +39,6 @@ target_include_directories(mbed-stubs-platform
 )
 target_link_libraries(mbed-stubs-platform
     PUBLIC
-        mbed-headers-base
         mbed-headers-hal
         mbed-headers-platform
 )
diff --git a/rtos/tests/UNITTESTS/doubles/CMakeLists.txt b/rtos/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -36,7 +36,6 @@ target_sources(mbed-stubs-rtos
 
 target_link_libraries(mbed-stubs-rtos
     PRIVATE        
-        mbed-headers-base
         mbed-headers-rtos
         mbed-headers-platform
         mbed-headers-drivers
diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@@ -18,7 +18,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@@ -14,7 +14,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -13,7 +13,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-headers
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@@ -14,7 +14,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-platform
         mbed-stubs-platform
diff --git a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -32,7 +32,6 @@ target_sources(mbed-stubs-blockdevice
 
 target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
-        mbed-headers-base
         mbed-headers-platform
         mbed-headers-blockdevice
 )
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -31,7 +31,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-drivers
         mbed-headers-filesystem
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -15,7 +15,6 @@ target_sources(${TEST_NAME}
 
 target_link_libraries(${TEST_NAME}
     PRIVATE
-        mbed-headers-base
         mbed-headers-blockdevice
         mbed-headers-drivers
         mbed-headers-hal

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,6 @@ target_include_directories(mbed-stubs-platform`
`39`	`39`	`)`
`40`	`40`	`target_link_libraries(mbed-stubs-platform`
`41`	`41`	`PUBLIC`
`42`		`- mbed-headers-base`
`43`	`42`	`mbed-headers-hal`
`44`	`43`	`mbed-headers-platform`
`45`	`44`	`)`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,6 @@ target_sources(mbed-stubs-blockdevice`
`32`	`32`
`33`	`33`	`target_link_libraries(mbed-stubs-blockdevice`
`34`	`34`	`PRIVATE`
`35`		`- mbed-headers-base`
`36`	`35`	`mbed-headers-platform`
`37`	`36`	`mbed-headers-blockdevice`
`38`	`37`	`)`