core changes taken over

This commit is contained in:
Robin Müller 2020-10-29 15:12:05 +01:00
parent 565fd63d08
commit 176ca56e35
3 changed files with 6 additions and 4 deletions

View File

@ -1,5 +1,5 @@
#include "CatchDefinitions.h"
#include <fsfw/objectmanager/ObjectManagerIF.h> #include <fsfw/objectmanager/ObjectManagerIF.h>
#include <fsfw/unittest/core/CatchDefinitions.h>
StorageManagerIF* tglob::getIpcStoreHandle() { StorageManagerIF* tglob::getIpcStoreHandle() {
if(objectManager != nullptr) { if(objectManager != nullptr) {

View File

@ -1,4 +1,5 @@
#pragma once #ifndef FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
#define FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_
#include <fsfw/ipc/messageQueueDefinitions.h> #include <fsfw/ipc/messageQueueDefinitions.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h> #include <fsfw/returnvalues/HasReturnvaluesIF.h>
@ -17,3 +18,4 @@ namespace tglob {
StorageManagerIF* getIpcStoreHandle(); StorageManagerIF* getIpcStoreHandle();
} }
#endif /* FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_ */

View File

@ -1,7 +1,7 @@
#include "CatchDefinitions.h" #include "CatchDefinitions.h"
#include "../config/cdatapool/dataPoolInit.h" #include <testcfg/cdatapool/dataPoolInit.h>
#include "../config/objects/Factory.h" #include <testcfg/objects/Factory.h>
#ifdef GCOV #ifdef GCOV