Unit tests: Make storage tests depend explicitly on headers it uses

The CMake target `mbed-headers` brings in all headers, and we are gradually moving away from it and explicitly use only headers needed by each unit test.
2021-07-06 15:53:40 +01:00 · 2021-07-06 15:53:40 +01:00 · 5c6c08cb75
parent 8d3fc33965
commit 5c6c08cb75
13 changed files with 30 additions and 13 deletions
--- a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@ -18,8 +18,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-platform
        gmock_main
 )
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@ -13,8 +13,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@ -14,8 +14,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@ -13,8 +13,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@ -13,8 +13,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@ -57,8 +57,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-platform
        mbed-stubs-blockdevice
        gmock_main
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@ -13,8 +13,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@ -14,8 +14,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@ -14,8 +14,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@ -14,8 +14,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-headers
        mbed-stubs-platform
        mbed-stubs-blockdevice
--- a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
+++ b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@ -14,8 +14,9 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-platform
        mbed-stubs-platform
        mbed-stubs-blockdevice
        gmock_main
--- a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
+++ b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@ -32,10 +32,13 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-drivers
        mbed-headers-filesystem
+        mbed-headers-hal
        mbed-headers-kvstore
+        mbed-headers-platform
        mbed-stubs-platform
        mbed-stubs-filesystemstore
        gmock_main
--- a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
+++ b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@ -20,9 +20,12 @@ target_sources(${TEST_NAME}

 target_link_libraries(${TEST_NAME}
    PRIVATE
-        mbed-headers
+        mbed-headers-base
        mbed-headers-blockdevice
+        mbed-headers-drivers
+        mbed-headers-hal
        mbed-headers-kvstore
+        mbed-headers-platform
        mbed-stubs-platform
        gmock_main
 )