Unit tests: Create mbed-headers-kvstore

LDong-Arm · LDong-Arm · commit e1331d58733f · 2021-07-02T16:27:00.000+01:00
Create a CMake target mbed-headers-kvstore to separate KVStore headers
from the generic mbed-headers-storage. Update tests to use it.
diff --git a/UNITTESTS/stubs/CMakeLists.txt b/UNITTESTS/stubs/CMakeLists.txt
@@ -43,12 +43,6 @@ target_include_directories(mbed-headers-base
 
 target_include_directories(mbed-headers-storage
     INTERFACE
-        ${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
 )
 
 target_include_directories(mbed-headers-connectivity
diff --git a/storage/kvstore/CMakeLists.txt b/storage/kvstore/CMakeLists.txt
@@ -1,6 +1,10 @@
 # Copyright (c) 2020 ARM Limited. All rights reserved.
 # SPDX-License-Identifier: Apache-2.0
 
+if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+    add_subdirectory(tests/UNITTESTS)
+endif()
+
 add_subdirectory(tdbstore)
 add_subdirectory(filesystemstore)
 add_subdirectory(securestore)
diff --git a/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt b/storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
@@ -35,6 +35,7 @@ target_link_libraries(${TEST_NAME}
         mbed-headers
         mbed-headers-blockdevice
         mbed-headers-filesystem
+        mbed-headers-kvstore
         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
@@ -11,5 +11,5 @@ target_sources(mbed-stubs-filesystemstore
 target_link_libraries(mbed-stubs-filesystemstore
     PRIVATE
         mbed-headers-blockdevice
-        mbed-headers-storage
+        mbed-headers-kvstore
 )
diff --git a/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt b/storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-headers-blockdevice
+        mbed-headers-kvstore
         mbed-stubs-platform
         gmock_main
 )
diff --git a/storage/kvstore/tests/UNITTESTS/.mbedignore b/storage/kvstore/tests/UNITTESTS/.mbedignore
@@ -0,0 +1 @@
+*
diff --git a/storage/kvstore/tests/UNITTESTS/CMakeLists.txt b/storage/kvstore/tests/UNITTESTS/CMakeLists.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2021 ARM Limited. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+add_library(mbed-headers-kvstore INTERFACE)
+
+target_include_directories(mbed-headers-kvstore
+    INTERFACE
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/kv_config/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/kvstore_global_api/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/securestore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/tdbstore/include
+        ${mbed-os_SOURCE_DIR}/storage/kvstore/filesystemstore/include
+)

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ target_sources(mbed-stubs-filesystemstore`
`11`	`11`	`target_link_libraries(mbed-stubs-filesystemstore`
`12`	`12`	`PRIVATE`
`13`	`13`	`mbed-headers-blockdevice`
`14`		`- mbed-headers-storage`
	`14`	`+ mbed-headers-kvstore`
`15`	`15`	`)`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ target_link_libraries(${TEST_NAME}`
`22`	`22`	`PRIVATE`
`23`	`23`	`mbed-headers`
`24`	`24`	`mbed-headers-blockdevice`
	`25`	`+ mbed-headers-kvstore`
`25`	`26`	`mbed-stubs-platform`
`26`	`27`	`gmock_main`
`27`	`28`	`)`