From 7ae6ac918dee5d51c3fc11a7c09460075085f3f2 Mon Sep 17 00:00:00 2001 From: Daniel Schloms Date: Mon, 27 May 2024 13:32:42 +0200 Subject: [PATCH] Fix formatting and add header to iwyu --- Sts1CobcSw/FileSystem/CMakeLists.txt | 4 +++- Sts1CobcSw/FileSystem/LfsFlash.cpp | 2 +- Tests/UnitTests/CMakeLists.txt | 4 +++- Tests/UnitTests/NoCatch2/CMakeLists.txt | 4 +++- Tests/UnitTests/NoCatch2/LockCollision.test.cpp | 2 +- iwyu.imp | 1 + 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Sts1CobcSw/FileSystem/CMakeLists.txt b/Sts1CobcSw/FileSystem/CMakeLists.txt index dcb8d942..5ebc0c30 100644 --- a/Sts1CobcSw/FileSystem/CMakeLists.txt +++ b/Sts1CobcSw/FileSystem/CMakeLists.txt @@ -10,7 +10,9 @@ else() target_sources(Sts1CobcSw_FileSystem PRIVATE LfsRam.cpp) target_sources(Sts1CobcSw_FileSystem_NoRodos PRIVATE LfsRam.cpp) target_sources(Sts1CobcSw_FileSystem PRIVATE LfsWrapper.cpp) - target_link_libraries(Sts1CobcSw_FileSystem_NoRodos PUBLIC littlefs::littlefs Sts1CobcSw_Outcome) + target_link_libraries( + Sts1CobcSw_FileSystem_NoRodos PUBLIC littlefs::littlefs Sts1CobcSw_Outcome + ) target_link_libraries(Sts1CobcSw_FileSystem_NoRodos PRIVATE Sts1CobcSw_Serial) target_compile_definitions(Sts1CobcSw_FileSystem_NoRodos PRIVATE NO_RODOS LFS_THREADSAFE) endif() diff --git a/Sts1CobcSw/FileSystem/LfsFlash.cpp b/Sts1CobcSw/FileSystem/LfsFlash.cpp index f8ba9e42..247ddea1 100644 --- a/Sts1CobcSw/FileSystem/LfsFlash.cpp +++ b/Sts1CobcSw/FileSystem/LfsFlash.cpp @@ -86,6 +86,7 @@ auto Read(lfs_config const * config, return 0; } + auto Program(lfs_config const * config, lfs_block_t blockNo, lfs_off_t offset, @@ -137,7 +138,6 @@ auto Sync([[maybe_unused]] lfs_config const * config) -> int auto Lock(const struct lfs_config * config) -> int { return 0; - } diff --git a/Tests/UnitTests/CMakeLists.txt b/Tests/UnitTests/CMakeLists.txt index 9679afc0..98174812 100644 --- a/Tests/UnitTests/CMakeLists.txt +++ b/Tests/UnitTests/CMakeLists.txt @@ -13,7 +13,9 @@ target_link_libraries( # TODO: Enable again once problem with segmentation violation on CI is fixed add_program(LfsRam LfsRam.test.cpp) -target_link_libraries(Sts1CobcSwTests_LfsRam PRIVATE Catch2::Catch2WithMain Sts1CobcSw_FileSystem_NoRodos) +target_link_libraries( + Sts1CobcSwTests_LfsRam PRIVATE Catch2::Catch2WithMain Sts1CobcSw_FileSystem_NoRodos +) add_program(Outcome Outcome.test.cpp) target_link_libraries(Sts1CobcSwTests_Outcome PRIVATE Catch2::Catch2WithMain) diff --git a/Tests/UnitTests/NoCatch2/CMakeLists.txt b/Tests/UnitTests/NoCatch2/CMakeLists.txt index e83c9417..b5908496 100644 --- a/Tests/UnitTests/NoCatch2/CMakeLists.txt +++ b/Tests/UnitTests/NoCatch2/CMakeLists.txt @@ -1,6 +1,8 @@ # No Catch2, since RODOS (main) is needed add_program(LfsRamCustomSemaphore LfsRamCustomSemaphore.test.cpp) -target_link_libraries(Sts1CobcSwTests_LfsRamCustomSemaphore PRIVATE rodos::rodos Sts1CobcSw_FileSystem) +target_link_libraries( + Sts1CobcSwTests_LfsRamCustomSemaphore PRIVATE rodos::rodos Sts1CobcSw_FileSystem +) add_program(LockCollision LockCollision.test.cpp) target_link_libraries(Sts1CobcSwTests_LockCollision PRIVATE rodos::rodos Sts1CobcSw_FileSystem) diff --git a/Tests/UnitTests/NoCatch2/LockCollision.test.cpp b/Tests/UnitTests/NoCatch2/LockCollision.test.cpp index 66d53b83..3b14491f 100644 --- a/Tests/UnitTests/NoCatch2/LockCollision.test.cpp +++ b/Tests/UnitTests/NoCatch2/LockCollision.test.cpp @@ -13,7 +13,7 @@ using RODOS::PRINTF; class LockingThread : public RODOS::StaticThread<> { public: - explicit LockingThread(const char * threadName) : StaticThread(threadName) + explicit LockingThread(char const * threadName) : StaticThread(threadName) { } diff --git a/iwyu.imp b/iwyu.imp index f8758a5a..618f59b4 100644 --- a/iwyu.imp +++ b/iwyu.imp @@ -85,6 +85,7 @@ { include: ["\"Sts1CobcSw/Utility/FlatArray.hpp\"", "public", "", "public"] }, { include: ["\"Sts1CobcSw/Utility/Span.hpp\"", "public", "", "public"] }, { include: ["\"Sts1CobcSw/Utility/Time.hpp\"", "public", "", "public"] }, + { include: ["\"Sts1CobcSw/Utility/LinuxSemaphore.hpp\"", "public", "", "public"] }, { include: ["\"Sts1CobcSw/CommandParser.hpp\"", "public", "", "public"] }, { include: ["\"Sts1CobcSw/EduCommunicationErrorThread.hpp\"", "public", "", "public"] }, { include: ["\"Sts1CobcSw/EduListenerThread.hpp\"", "public", "", "public"] },