Skip to content

Unit tests: storage: Only use headers, sources and definitions needed by each test #14882

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 7, 2021
Merged

Unit tests: storage: Only use headers, sources and definitions needed by each test #14882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c6c08c
Unit tests: Make storage tests depend explicitly on headers it uses
LDong-Arm Jul 6, 2021
fcb71fb
Unit tests: Clean up unused sources and definitions from storage
LDong-Arm Jul 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/SFDP/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/BufferedBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/blockdevice/tests/UNITTESTS/blockdevice/ChainingBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
target_sources(${TEST_NAME}
PRIVATE
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ChainingBlockDevice.cpp
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
test_ChainingBlockDevice.cpp
)

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
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/ExhaustibleBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/FlashSimBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
47 changes: 2 additions & 45 deletions storage/blockdevice/tests/UNITTESTS/blockdevice/HeapBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,50 +5,6 @@ set(TEST_NAME heap-blockdevice-unittest)

add_executable(${TEST_NAME})

target_compile_definitions(${TEST_NAME}
PRIVATE
MBED_CONF_FAT_CHAN_FFS_DBG=0
MBED_CONF_FAT_CHAN_FF_FS_READONLY=0
MBED_CONF_FAT_CHAN_FF_FS_MINIMIZE=0
MBED_CONF_FAT_CHAN_FF_USE_STRFUNC=0
MBED_CONF_FAT_CHAN_FF_USE_FIND=0
MBED_CONF_FAT_CHAN_FF_USE_MKFS=1
MBED_CONF_FAT_CHAN_FF_USE_FASTSEEK=0
MBED_CONF_FAT_CHAN_FF_USE_EXPAND=0
MBED_CONF_FAT_CHAN_FF_USE_CHMOD=0
MBED_CONF_FAT_CHAN_FF_USE_LABEL=0
MBED_CONF_FAT_CHAN_FF_USE_FORWARD=0
MBED_CONF_FAT_CHAN_FF_CODE_PAGE=437
MBED_CONF_FAT_CHAN_FF_USE_LFN=3
MBED_CONF_FAT_CHAN_FF_MAX_LFN=255
MBED_CONF_FAT_CHAN_FF_LFN_UNICODE=0
MBED_CONF_FAT_CHAN_FF_LFN_BUF=255
MBED_CONF_FAT_CHAN_FF_SFN_BUF=12
MBED_CONF_FAT_CHAN_FF_STRF_ENCODE=3
MBED_CONF_FAT_CHAN_FF_FS_RPATH=1
MBED_CONF_FAT_CHAN_FF_VOLUMES=4
MBED_CONF_FAT_CHAN_FF_STR_VOLUME_ID=0
MBED_CONF_FAT_CHAN_FF_VOLUME_STRS=\"RAM\",\"NAND\",\"CF\",\"SD\",\"SD2\",\"USB\",\"USB2\",\"USB3\"
MBED_CONF_FAT_CHAN_FF_MULTI_PARTITION=0
MBED_CONF_FAT_CHAN_FF_MIN_SS=512
MBED_CONF_FAT_CHAN_FF_MAX_SS=4096
MBED_CONF_FAT_CHAN_FF_USE_TRIM=1
MBED_CONF_FAT_CHAN_FF_FS_NOFSINFO=0
MBED_CONF_FAT_CHAN_FF_FS_TINY=1
MBED_CONF_FAT_CHAN_FF_FS_EXFAT=0
MBED_CONF_FAT_CHAN_FF_FS_HEAPBUF=1
MBED_CONF_FAT_CHAN_FF_FS_NORTC=0
MBED_CONF_FAT_CHAN_FF_NORTC_MON=1
MBED_CONF_FAT_CHAN_FF_NORTC_MDAY=1
MBED_CONF_FAT_CHAN_FF_NORTC_YEAR=2017
MBED_CONF_FAT_CHAN_FF_FS_LOCK=0
MBED_CONF_FAT_CHAN_FF_FS_REENTRANT=0
MBED_CONF_FAT_CHAN_FF_FS_TIMEOUT=1000
MBED_CONF_FAT_CHAN_FF_SYNC_t=HANDLE
MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_CLUSTER=0
MBED_CONF_FAT_CHAN_FLUSH_ON_NEW_SECTOR=1
)

target_sources(${TEST_NAME}
PRIVATE
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
Expand All @@ -57,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-platform
mbed-stubs-blockdevice
gmock_main
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/MBRBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/ObservingBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/blockdevice/tests/UNITTESTS/blockdevice/ProfilingBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
target_sources(${TEST_NAME}
PRIVATE
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ProfilingBlockDevice.cpp
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
test_ProfilingBlockDevice.cpp
)

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
Expand Down
4 changes: 2 additions & 2 deletions storage/blockdevice/tests/UNITTESTS/blockdevice/ReadOnlyBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ add_executable(${TEST_NAME})
target_sources(${TEST_NAME}
PRIVATE
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/ReadOnlyBlockDevice.cpp
${mbed-os_SOURCE_DIR}/storage/blockdevice/source/HeapBlockDevice.cpp
test_ReadOnlyBlockDevice.cpp
)

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
Expand Down
3 changes: 2 additions & 1 deletion storage/blockdevice/tests/UNITTESTS/blockdevice/SlicingBlockDevice/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down