Skip to content

Commit 5c6c08c

Browse files
committed
Unit tests: Make storage tests depend explicitly on headers it uses
The CMake target `mbed-headers` brings in all headers, and we are gradually moving away from it and explicitly use only headers needed by each unit test.
1 parent 8d3fc33 commit 5c6c08c

File tree

13 files changed

+30
-13
lines changed

13 files changed

+30
-13
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@ target_sources(${TEST_NAME}
1818

1919
target_link_libraries(${TEST_NAME}
2020
PRIVATE
21-
mbed-headers
21+
mbed-headers-base
2222
mbed-headers-blockdevice
23+
mbed-headers-platform
2324
mbed-stubs-platform
2425
gmock_main
2526
)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
1313

1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
16-
mbed-headers
16+
mbed-headers-base
1717
mbed-headers-blockdevice
18+
mbed-headers-platform
1819
mbed-stubs-headers
1920
mbed-stubs-platform
2021
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
1414

1515
target_link_libraries(${TEST_NAME}
1616
PRIVATE
17-
mbed-headers
17+
mbed-headers-base
1818
mbed-headers-blockdevice
19+
mbed-headers-platform
1920
mbed-stubs-headers
2021
mbed-stubs-platform
2122
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
1313

1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
16-
mbed-headers
16+
mbed-headers-base
1717
mbed-headers-blockdevice
18+
mbed-headers-platform
1819
mbed-stubs-headers
1920
mbed-stubs-platform
2021
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
1313

1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
16-
mbed-headers
16+
mbed-headers-base
1717
mbed-headers-blockdevice
18+
mbed-headers-platform
1819
mbed-stubs-headers
1920
mbed-stubs-platform
2021
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,9 @@ target_sources(${TEST_NAME}
5757

5858
target_link_libraries(${TEST_NAME}
5959
PRIVATE
60-
mbed-headers
60+
mbed-headers-base
6161
mbed-headers-blockdevice
62+
mbed-headers-platform
6263
mbed-stubs-platform
6364
mbed-stubs-blockdevice
6465
gmock_main

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ target_sources(${TEST_NAME}
1313

1414
target_link_libraries(${TEST_NAME}
1515
PRIVATE
16-
mbed-headers
16+
mbed-headers-base
1717
mbed-headers-blockdevice
18+
mbed-headers-platform
1819
mbed-stubs-headers
1920
mbed-stubs-platform
2021
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
1414

1515
target_link_libraries(${TEST_NAME}
1616
PRIVATE
17-
mbed-headers
17+
mbed-headers-base
1818
mbed-headers-blockdevice
19+
mbed-headers-platform
1920
mbed-stubs-headers
2021
mbed-stubs-platform
2122
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
1414

1515
target_link_libraries(${TEST_NAME}
1616
PRIVATE
17-
mbed-headers
17+
mbed-headers-base
1818
mbed-headers-blockdevice
19+
mbed-headers-platform
1920
mbed-stubs-headers
2021
mbed-stubs-platform
2122
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
1414

1515
target_link_libraries(${TEST_NAME}
1616
PRIVATE
17-
mbed-headers
17+
mbed-headers-base
1818
mbed-headers-blockdevice
19+
mbed-headers-platform
1920
mbed-stubs-headers
2021
mbed-stubs-platform
2122
mbed-stubs-blockdevice

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ target_sources(${TEST_NAME}
1414

1515
target_link_libraries(${TEST_NAME}
1616
PRIVATE
17-
mbed-headers
17+
mbed-headers-base
1818
mbed-headers-blockdevice
19+
mbed-headers-platform
1920
mbed-stubs-platform
2021
mbed-stubs-blockdevice
2122
gmock_main

storage/kvstore/filesystemstore/tests/UNITTESTS/FileSystemStore/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ target_sources(${TEST_NAME}
3232

3333
target_link_libraries(${TEST_NAME}
3434
PRIVATE
35-
mbed-headers
35+
mbed-headers-base
3636
mbed-headers-blockdevice
37+
mbed-headers-drivers
3738
mbed-headers-filesystem
39+
mbed-headers-hal
3840
mbed-headers-kvstore
41+
mbed-headers-platform
3942
mbed-stubs-platform
4043
mbed-stubs-filesystemstore
4144
gmock_main

storage/kvstore/tdbstore/tests/UNITTESTS/TDBStore/CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,12 @@ target_sources(${TEST_NAME}
2020

2121
target_link_libraries(${TEST_NAME}
2222
PRIVATE
23-
mbed-headers
23+
mbed-headers-base
2424
mbed-headers-blockdevice
25+
mbed-headers-drivers
26+
mbed-headers-hal
2527
mbed-headers-kvstore
28+
mbed-headers-platform
2629
mbed-stubs-platform
2730
gmock_main
2831
)

0 commit comments

Comments
 (0)