Unit tests: Create mbed-headers-blockdevice

LDong-Arm · LDong-Arm · commit 90446a034599 · 2021-07-02T16:25:00.000+01:00
Create a CMake target mbed-headers-blockdevice to separate BlockDevice
headers from the generic mbed-headers-storage. Update tests to use it.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -50,15 +50,13 @@ target_include_directories(mbed-headers-storage
         ${mbed-os_SOURCE_DIR}/storage/filesystem/littlefsv2/littlefs
         ${mbed-os_SOURCE_DIR}/storage/filesystem/littlefsv2/littlefs/bd
         ${mbed-os_SOURCE_DIR}/storage/filesystem/littlefs/littlefs
-        ${mbed-os_SOURCE_DIR}/storage/blockdevice/include
         ${mbed-os_SOURCE_DIR}/storage/filesystem/include
         ${mbed-os_SOURCE_DIR}/storage/kvstore/include
         ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config
         ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config/include
         ${mbed-os_SOURCE_DIR}/storage/kvstore/tdbstore/include
         ${mbed-os_SOURCE_DIR}/storage/kvstore/filesystemstore/include
         ${mbed-os_SOURCE_DIR}/storage/kvstore/kvstore_global_api/include
-        ${mbed-os_SOURCE_DIR}/storage/blockdevice/include/blockdevice
 )
 
 target_include_directories(mbed-headers-connectivity
diff --git a/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-platform
         gmock_main
 )
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
@@ -58,6 +58,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-platform
         mbed-stubs-blockdevice
         gmock_main
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
@@ -14,6 +14,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
         mbed-stubs-platform
         mbed-stubs-blockdevice
diff --git a/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-platform
         mbed-stubs-blockdevice
         gmock_main
diff --git a/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/blockdevice/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -1,6 +1,14 @@
 # Copyright (c) 2021 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+add_library(mbed-headers-blockdevice INTERFACE)
+
+target_include_directories(mbed-headers-blockdevice
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/storage/blockdevice/include
+        ${mbed-os_SOURCE_DIR}/storage/blockdevice/include/blockdevice
+)
+
 add_library(mbed-stubs-blockdevice)
 
 target_include_directories(mbed-stubs-blockdevice
@@ -26,5 +34,5 @@ target_link_libraries(mbed-stubs-blockdevice
     PRIVATE
         mbed-headers-base
         mbed-headers-platform
-        mbed-headers-storage
+        mbed-headers-blockdevice
 )
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -33,6 +33,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-platform
         mbed-stubs-filesystemstore
         gmock_main
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/doubles/CMakeLists.txt
@@ -10,5 +10,6 @@ target_sources(mbed-stubs-filesystemstore
 
 target_link_libraries(mbed-stubs-filesystemstore
     PRIVATE
+        mbed-headers-blockdevice
         mbed-headers-storage
 )
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -21,6 +21,7 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-platform
         gmock_main
 )

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ target_sources(${TEST_NAME}`
`19`	`19`	`target_link_libraries(${TEST_NAME}`
`20`	`20`	`PRIVATE`
`21`	`21`	`mbed-headers`
	`22`	`+ mbed-headers-blockdevice`
`22`	`23`	`mbed-stubs-platform`
`23`	`24`	`gmock_main`
`24`	`25`	`)`