KSat/fsfw
19
6
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

some changes

Browse Source
This commit is contained in:
Robin Müller
2020-10-29 12:23:27 +01:00
parent 50151310dc
commit c8fd698b3a
57 changed files with 828 additions and 19160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
unittest/core/CatchRunner.cpp
View File

@ -9,7 +9,9 @@
#ifndef NO_UNIT_TEST_FRAMEWORK
#define CATCH_CONFIG_RUNNER
#include <fsfw/unittest/catch2/catch.hpp>
#include <catch2/catch.hpp>
#if CUSTOM_UNITTEST_RUNNER == 0
extern int customSetup();
@ -23,5 +25,7 @@ int main( int argc, char* argv[] ) {
return result;
}
#endif
#endif

23
unittest/core/CatchSetup.cpp
View File

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