using relative includes now

This commit is contained in:
Robin Müller 2020-12-01 16:50:02 +01:00
parent 8cddf8f509
commit c741ef3945
4 changed files with 13 additions and 11 deletions

View File

@ -1,4 +1,4 @@
#include <fsfw/unittest/internal/UnittDefinitions.h> #include "UnittDefinitions.h"
ReturnValue_t unitt::put_error(std::string errorId) { ReturnValue_t unitt::put_error(std::string errorId) {
sif::error << "Unit Tester error: Failed at test ID " sif::error << "Unit Tester error: Failed at test ID "

View File

@ -1,7 +1,8 @@
#include <fsfw/ipc/MessageQueueIF.h> #include "IntTestMq.h"
#include <fsfw/ipc/QueueFactory.h> #include "../UnittDefinitions.h"
#include <fsfw/unittest/internal/osal/IntTestMq.h>
#include <fsfw/unittest/internal/UnittDefinitions.h> #include "../../ipc/MessageQueueIF.h"
#include "../../ipc/QueueFactory.h"
#include <array> #include <array>

View File

@ -1,10 +1,10 @@
#include "IntTestMutex.h" #include "IntTestMutex.h"
#include <fsfw/ipc/MutexFactory.h> #include "../../ipc/MutexFactory.h"
#include "../UnittDefinitions.h" #include "../UnittDefinitions.h"
#if defined(hosted) #if defined(hosted)
#include <fsfw/osal/hosted/Mutex.h> #include "../../osal/hosted/Mutex.h"
#include <thread> #include <thread>
#include <future> #include <future>
#endif #endif
@ -20,7 +20,7 @@ void testmutex::testMutex() {
// timed_mutex from the C++ library specifies undefined behaviour if // timed_mutex from the C++ library specifies undefined behaviour if
// the timed mutex is locked twice from the same thread. // the timed mutex is locked twice from the same thread.
#if defined(hosted) #if defined(hosted)
// hold on, this actually worked ? :-D This calls the function from // This calls the function from
// another thread and stores the returnvalue in a future. // another thread and stores the returnvalue in a future.
auto future = std::async(&MutexIF::lockMutex, mutex, 1); auto future = std::async(&MutexIF::lockMutex, mutex, 1);
result = future.get(); result = future.get();

View File

@ -1,8 +1,9 @@
#include "IntTestSemaphore.h" #include "IntTestSemaphore.h"
#include <fsfw/tasks/SemaphoreFactory.h>
#include "../UnittDefinitions.h" #include "../UnittDefinitions.h"
#include <fsfw/serviceinterface/ServiceInterfaceStream.h>
#include <fsfw/timemanager/Stopwatch.h> #include "../../tasks/SemaphoreFactory.h"
#include "../../serviceinterface/ServiceInterfaceStream.h"
#include "../../timemanager/Stopwatch.h"
void testsemaph::testBinSemaph() { void testsemaph::testBinSemaph() {