Updating development with upstream changes #2

Closed
muellerr wants to merge 38 commits from mueller/master into development
7 changed files with 13 additions and 13 deletions
Showing only changes of commit d8d2f207e1 - Show all commits

View File

@ -1,6 +1,6 @@
#include "../../../container/DynamicFIFO.h"
#include "../../../container/FIFO.h"
#include "../../../returnvalues/HasReturnvaluesIF.h"
#include <fsfw/container/DynamicFIFO.h>
#include <fsfw/container/FIFO.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,6 +1,6 @@
#include "../../../container/DynamicFIFO.h"
#include "../../../container/FIFO.h"
#include "../../../returnvalues/HasReturnvaluesIF.h"
#include <fsfw/container/DynamicFIFO.h>
#include <fsfw/container/FIFO.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,5 +1,5 @@
#include "../../../container/FixedMap.h"
#include "../../../returnvalues/HasReturnvaluesIF.h"
#include <fsfw/container/FixedMap.h>
#include <fsfw/returnvalues/HasReturnvaluesIF.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,5 +1,5 @@
#include "../../../ipc/MessageQueueIF.h"
#include "../../../ipc/QueueFactory.h"
#include <fsfw/ipc/MessageQueueIF.h>
#include <fsfw/ipc/QueueFactory.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,4 +1,4 @@
#include "../../../serialize/SerialBufferAdapter.h"
#include <fsfw/serialize/SerialBufferAdapter.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,7 +1,7 @@
#include "TestSerialLinkedPacket.h"
#include <unittest/core/CatchDefinitions.h>
#include "../../../globalfunctions/arrayprinter.h"
#include <fsfw/globalfunctions/arrayprinter.h>
#include <catch2/catch_test_macros.hpp>
#include <unittest/core/CatchDefinitions.h>

View File

@ -1,4 +1,4 @@
#include "../../../serialize/SerializeAdapter.h"
#include <fsfw/serialize/SerializeAdapter.h>
#include <catch2/catch_test_macros.hpp>
#include <catch2/catch_approx.hpp>