Skip to content

Commit b1645b2

Browse files
committed
Move storage stubs into subdirectories of Mbed OS storage
Move storage stubs from UNITTESTS/stubs into components inside the top-level storage directory. Specifically, * storage/blockdevice/tests/UNITTESTS/doubles/ for BlockDevice stubs. * storage/kvstore/filesystemstore/tests/UNITTESTS/ for a stub used by the FileSystemStore test. The stub has been renamed from kv_config_stub.cpp to filesystemstore_kv_config_stub.cpp, to make it evident why it doesn't go into storage/kvstore/kv_config/.
1 parent 436291f commit b1645b2

File tree

28 files changed

+36
-7
lines changed

28 files changed

+36
-7
lines changed

UNITTESTS/stubs/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ target_include_directories(mbed-stubs-headers
103103
add_subdirectory(connectivity)
104104
add_subdirectory(events)
105105
add_subdirectory(platform)
106-
add_subdirectory(storage)
107106

108107
add_library(mbed-stubs INTERFACE)
109108

@@ -115,5 +114,4 @@ target_link_libraries(mbed-stubs
115114
mbed-stubs-hal
116115
mbed-stubs-platform
117116
mbed-stubs-rtos
118-
mbed-stubs-storage
119117
)

storage/blockdevice/tests/UNITTESTS/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33

44
add_subdirectory(blockdevice)
55
add_subdirectory(SFDP)
6+
add_subdirectory(doubles)

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
1616
mbed-headers
1717
mbed-stubs-headers
1818
mbed-stubs-platform
19+
mbed-stubs-blockdevice
1920
gmock_main
2021
)
2122

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
1717
mbed-headers
1818
mbed-stubs-headers
1919
mbed-stubs-platform
20+
mbed-stubs-blockdevice
2021
gmock_main
2122
)
2223

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
1616
mbed-headers
1717
mbed-stubs-headers
1818
mbed-stubs-platform
19+
mbed-stubs-blockdevice
1920
gmock_main
2021
)
2122

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
1616
mbed-headers
1717
mbed-stubs-headers
1818
mbed-stubs-platform
19+
mbed-stubs-blockdevice
1920
gmock_main
2021
)
2122

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ target_link_libraries(${TEST_NAME}
5959
PRIVATE
6060
mbed-headers
6161
mbed-stubs-platform
62+
mbed-stubs-blockdevice
6263
gmock_main
6364
)
6465

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ target_link_libraries(${TEST_NAME}
1616
mbed-headers
1717
mbed-stubs-headers
1818
mbed-stubs-platform
19+
mbed-stubs-blockdevice
1920
gmock_main
2021
)
2122

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
1717
mbed-headers
1818
mbed-stubs-headers
1919
mbed-stubs-platform
20+
mbed-stubs-blockdevice
2021
gmock_main
2122
)
2223

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ target_link_libraries(${TEST_NAME}
1717
mbed-headers
1818
mbed-stubs-headers
1919
mbed-stubs-platform
20+
mbed-stubs-blockdevice
2021
gmock_main
2122
)
2223

0 commit comments

Comments
 (0)