Merge pull request #14862 from LDong-Arm/storage_stubs

Unit tests: Move storage stubs into the storage directory

Author: 0xc0170

UNITTESTS/stubs/CMakeLists.txt

@@ -6,15 +6,13 @@ add_library(mbed-headers INTERFACE)
 add_library(mbed-headers-base INTERFACE)
 add_library(mbed-headers-platform INTERFACE)
 add_library(mbed-headers-connectivity INTERFACE)
-add_library(mbed-headers-storage INTERFACE)
 add_library(mbed-headers-events INTERFACE)
 
 target_link_libraries(mbed-headers
     INTERFACE
         mbed-headers-base
         mbed-headers-platform
         mbed-headers-connectivity
-        mbed-headers-storage
         mbed-headers-drivers
         mbed-headers-hal
         mbed-headers-events
@@ -41,26 +39,6 @@ target_include_directories(mbed-headers-base
         ${mbed-os_SOURCE_DIR}/UNITTESTS/target_h/sys
 )
 
-target_include_directories(mbed-headers-storage
-    INTERFACE
-        ${mbed-os_SOURCE_DIR}/storage/filesystem/fat/include
-        ${mbed-os_SOURCE_DIR}/storage/filesystem/fat/ChaN
-        ${mbed-os_SOURCE_DIR}/storage/filesystem/littlefs
-        ${mbed-os_SOURCE_DIR}/storage/filesystem/littlefs/include
-        ${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
     INTERFACE
         ${mbed-os_SOURCE_DIR}/connectivity/libraries/nanostack-libservice
@@ -103,7 +81,6 @@ target_include_directories(mbed-stubs-headers
 add_subdirectory(connectivity)
 add_subdirectory(events)
 add_subdirectory(platform)
-add_subdirectory(storage)
 
 add_library(mbed-stubs INTERFACE)
 
@@ -115,5 +92,4 @@ target_link_libraries(mbed-stubs
         mbed-stubs-hal
         mbed-stubs-platform
         mbed-stubs-rtos
-        mbed-stubs-storage
 )

UNITTESTS/stubs/EmulatedSD.h

@@ -25,6 +25,7 @@ target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
         mbed-headers-cellular
+        mbed-headers-filesystem
         mbed-stubs
         mbed-stubs-cellular
         mbed-stubs-headers

UNITTESTS/stubs/storage/CMakeLists.txt

@@ -35,6 +35,7 @@ if(${CMAKE_CROSSCOMPILING})
 else()
     # Add these subdirectories for the Unit test
     add_subdirectory(blockdevice)
+    add_subdirectory(filesystem)
     add_subdirectory(kvstore)
 endif()
 

UNITTESTS/stubs/storage/EmulatedSD.cpp

@@ -3,3 +3,4 @@
 
 add_subdirectory(blockdevice)
 add_subdirectory(SFDP)
+add_subdirectory(doubles)

connectivity/cellular/tests/UNITTESTS/framework/AT/at_cellularcontext/CMakeLists.txt

@@ -19,7 +19,8 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
-        mbed-stubs-platform      
+        mbed-headers-blockdevice
+        mbed-stubs-platform
         gmock_main
 )
 

storage/CMakeLists.txt

@@ -14,8 +14,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
-        mbed-stubs-platform   
+        mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/CMakeLists.txt

@@ -15,8 +15,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
-        mbed-stubs-platform      
+        mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt

@@ -14,8 +14,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
-        mbed-stubs-platform      
+        mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt

@@ -14,8 +14,10 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
+        mbed-headers-blockdevice
         mbed-stubs-headers
-        mbed-stubs-platform      
+        mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )
 

storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt

@@ -58,7 +58,9 @@ target_sources(${TEST_NAME}
 target_link_libraries(${TEST_NAME}
     PRIVATE
         mbed-headers
-        mbed-stubs-platform      
+        mbed-headers-blockdevice
+        mbed-stubs-platform
+        mbed-stubs-blockdevice
         gmock_main
 )