eive/fsfw
15
1
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases 1 Wiki Activity

some fixes for master

Browse Source
This commit is contained in:
Robin Müller
2020-10-29 12:42:29 +01:00
parent c8fd698b3a
commit 97f6dace26
4 changed files with 306 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
unittest/core/CatchDefinitions.cpp
View File

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

4
unittest/core/CatchDefinitions.h
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/returnvalues/HasReturnvaluesIF.h>
@ -17,3 +18,4 @@ namespace tglob {
StorageManagerIF* getIpcStoreHandle();
}
#endif /* FSFW_UNITTEST_CORE_CATCHDEFINITIONS_H_ */

12
unittest/core/CatchSetup.cpp
View File

@ -1,7 +1,7 @@
#include "CatchDefinitions.h"
#include "../config/cdatapool/dataPoolInit.h"
#include "../config/objects/Factory.h"
#include <testcfg/cdatapool/dataPoolInit.h>
#include <testcfg/objects/Factory.h>
#ifdef GCOV
@ -11,15 +11,15 @@
#include "../../objectmanager/ObjectManager.h"
#include "../../objectmanager/ObjectManagerIF.h"
#include "../../storagemanager/StorageManagerIF.h"
#include "../../datapoolglob/GlobalDataPool.h"
#include "../../datapool/DataPool.h"
#include "../../serviceinterface/ServiceInterfaceStream.h"
/* Global instantiations normally done in main.cpp */
/* Initialize Data Pool */
namespace glob {
GlobalDataPool dataPool(datapool::dataPoolInit);
}
//namespace glob {
DataPool dataPool(datapool::dataPoolInit);
//}
namespace sif {