fsfw/fsfw
fsfw/fsfw
10
3
Fork 6
Code Issues 31 Pull Requests 4 Releases 10 Wiki Activity

fixed impact of windows fixes on other builds
All checks were successful
fsfw/fsfw/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
Ulrich Mohr 2023-01-26 12:33:39 +01:00
parent 81c5b2ec95
commit 70fd9ff3e5
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/fsfw/osal/host/TaskFactory.cpp
View File

@ -50,6 +50,6 @@ void TaskFactory::printMissedDeadline() {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::warning << "TaskFactory::printMissedDeadline: " << name << std::endl; sif::warning << "TaskFactory::printMissedDeadline: " << name << std::endl;
#else #else
sif::printWarning("TaskFactory::printMissedDeadline: %s\n", name); sif::printWarning("TaskFactory::printMissedDeadline: %s\n", name.c_str());
#endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */ #endif /* FSFW_CPP_OSTREAM_ENABLED == 1 */
} }

6
src/fsfw_hal/linux/CommandExecutor.cpp
View File

@ -67,7 +67,7 @@ void CommandExecutor::printLastError(std::string funcName) const {
sif::warning << funcName << " pclose failed with code " << lastError << ": " sif::warning << funcName << " pclose failed with code " << lastError << ": "
<< strerror(lastError) << std::endl; << strerror(lastError) << std::endl;
#else #else
sif::printError("%s pclose failed with code %d: %s\n", funcName, lastError, sif::printError("%s pclose failed with code %d: %s\n", funcName.c_str(), lastError,
strerror(lastError)); strerror(lastError));
#endif #endif
} }
@ -119,7 +119,7 @@ ReturnValue_t CommandExecutor::check(bool& replyReceived) {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << currentCmd << " | " << readVec.data(); sif::info << currentCmd << " | " << readVec.data();
#else #else
sif::printInfo("%s | %s", currentCmd, readVec.data()); sif::printInfo("%s | %s", currentCmd.c_str(), readVec.data());
#endif #endif
} }
if (ringBuffer != nullptr) { if (ringBuffer != nullptr) {
@ -188,7 +188,7 @@ ReturnValue_t CommandExecutor::executeBlocking() {
#if FSFW_CPP_OSTREAM_ENABLED == 1 #if FSFW_CPP_OSTREAM_ENABLED == 1
sif::info << currentCmd << " | " << output; sif::info << currentCmd << " | " << output;
#else #else
sif::printInfo("%s | %s", currentCmd, output); sif::printInfo("%s | %s", currentCmd.c_str(), output.c_str());
#endif #endif
} }
if (ringBuffer != nullptr) { if (ringBuffer != nullptr) {

4
unittests/datapoollocal/testDataSet.cpp
View File

@ -108,7 +108,7 @@ TEST_CASE("DataSetTest", "[DataSetTest]") {
CHECK(maxSize == sizeof(uint8_t) + sizeof(float) + sizeof(uint16_t) * 3); CHECK(maxSize == sizeof(uint8_t) + sizeof(float) + sizeof(uint16_t) * 3);
serSize = 0; serSize = 0;
/* Already reserve additional space for validity buffer, will be needed later */ /* Already reserve additional space for validity buffer, will be needed later */
std::vector<uint8_t> buffer(maxSize); std::vector<uint8_t> buffer(maxSize+1);
uint8_t* buffPtr = buffer.data(); uint8_t* buffPtr = buffer.data();
CHECK(localSet.serialize(&buffPtr, &serSize, maxSize, SerializeIF::Endianness::MACHINE) == CHECK(localSet.serialize(&buffPtr, &serSize, maxSize, SerializeIF::Endianness::MACHINE) ==
returnvalue::OK); returnvalue::OK);
@ -157,7 +157,7 @@ TEST_CASE("DataSetTest", "[DataSetTest]") {
CHECK(maxSize == sizeof(uint8_t) + sizeof(uint16_t) * 3 + sizeof(float) + 1); CHECK(maxSize == sizeof(uint8_t) + sizeof(uint16_t) * 3 + sizeof(float) + 1);
serSize = 0; serSize = 0;
buffPtr = buffer.data(); buffPtr = buffer.data();
CHECK(localSet.serialize(&buffPtr, &serSize, maxSize, SerializeIF::Endianness::MACHINE) == CHECK(localSet.serialize(&buffPtr, &serSize, buffer.size(), SerializeIF::Endianness::MACHINE) ==
returnvalue::OK); returnvalue::OK);
CHECK(rawUint8 == 232); CHECK(rawUint8 == 232);
std::memcpy(&rawFloat, buffer.data() + sizeof(uint8_t), sizeof(float)); std::memcpy(&rawFloat, buffer.data() + sizeof(uint8_t), sizeof(float));

2
unittests/datapoollocal/testLocalPoolManager.cpp
View File

@ -419,7 +419,7 @@ TEST_CASE("Local Pool Manager Tests", "[LocManTest]") {
CHECK(poolOwner.changedVariableCallbackWasCalled(gpidToCheck, storeId) == true); CHECK(poolOwner.changedVariableCallbackWasCalled(gpidToCheck, storeId) == true);
CHECK(gpidToCheck == lpool::uint8VarGpid); CHECK(gpidToCheck == lpool::uint8VarGpid);
poolOwner.poolManager.printPoolEntry(lpool::uint8VarId); //poolOwner.poolManager.printPoolEntry(lpool::uint8VarId);
} }
/* we need to reset the subscription list because the pool owner /* we need to reset the subscription list because the pool owner

12
unittests/hal/testFsMock.cpp
View File

@ -9,9 +9,9 @@ TEST_CASE("Filesystem Mock", "[mocks]") {
auto fsMock = FilesystemMock(); auto fsMock = FilesystemMock();
SECTION("Create File") { SECTION("Create File") {
FilesystemParams params(L"hello.txt"); FilesystemParams params("hello.txt");
CHECK(fsMock.createFile(params) == returnvalue::OK); CHECK(fsMock.createFile(params) == returnvalue::OK);
auto iter = fsMock.fileMap.find(L"hello.txt"); auto iter = fsMock.fileMap.find("hello.txt");
REQUIRE(iter != fsMock.fileMap.end()); REQUIRE(iter != fsMock.fileMap.end());
FilesystemMock::FileInfo &stats = iter->second; FilesystemMock::FileInfo &stats = iter->second;
CHECK(stats.fileSegQueue.empty()); CHECK(stats.fileSegQueue.empty());
@ -20,10 +20,10 @@ TEST_CASE("Filesystem Mock", "[mocks]") {
SECTION("Write to File") { SECTION("Write to File") {
std::string testData = "test data"; std::string testData = "test data";
FileOpParams params(L"hello.txt", testData.size()); FileOpParams params("hello.txt", testData.size());
CHECK(fsMock.writeToFile(params, reinterpret_cast<const uint8_t *>(testData.data())) == CHECK(fsMock.writeToFile(params, reinterpret_cast<const uint8_t *>(testData.data())) ==
returnvalue::OK); returnvalue::OK);
auto iter = fsMock.fileMap.find(L"hello.txt"); auto iter = fsMock.fileMap.find("hello.txt");
REQUIRE(iter != fsMock.fileMap.end()); REQUIRE(iter != fsMock.fileMap.end());
FilesystemMock::FileInfo &stats = iter->second; FilesystemMock::FileInfo &stats = iter->second;
CHECK(not stats.fileSegQueue.empty()); CHECK(not stats.fileSegQueue.empty());
@ -37,10 +37,10 @@ TEST_CASE("Filesystem Mock", "[mocks]") {
} }
SECTION("Create Directory") { SECTION("Create Directory") {
FilesystemParams params(L"hello"); FilesystemParams params("hello");
CHECK(fsMock.createDirectory(params) == returnvalue::OK); CHECK(fsMock.createDirectory(params) == returnvalue::OK);
REQUIRE(not fsMock.dirMap.empty()); REQUIRE(not fsMock.dirMap.empty());
auto iter = fsMock.dirMap.find(L"hello"); auto iter = fsMock.dirMap.find("hello");
REQUIRE(iter != fsMock.dirMap.end()); REQUIRE(iter != fsMock.dirMap.end());
auto &dirInfo = iter->second; auto &dirInfo = iter->second;
CHECK(dirInfo.createCallCount == 1); CHECK(dirInfo.createCallCount == 1);