trying to fuse header / inc

2021-07-19 16:25:51 +02:00
parent 7849b8e391
commit d47906e833
767 changed files with 117 additions and 135 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,2 +1 @@
 add_subdirectory(src)
-add_subdirectory(inc)
--- a/tests/inc/CMakeLists.txt
+++ b/tests/inc/CMakeLists.txt
@@ -1,7 +0,0 @@
-target_include_directories(${LIB_FSFW_NAME} PRIVATE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-target_include_directories(${LIB_FSFW_NAME} INTERFACE
-    ${CMAKE_CURRENT_SOURCE_DIR}
-)
--- a/tests/src/CMakeLists.txt
+++ b/tests/src/CMakeLists.txt
@@ -1,7 +1,9 @@
-if(FSFW_ADD_INTERNAL_TESTS)
-    add_subdirectory(internal)
-endif()
+target_include_directories(${LIB_FSFW_NAME} PRIVATE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)

-if(FSFW_ADD_UNITTESTS)
-    add_subdirectory(tests)
-endif()
+target_include_directories(${LIB_FSFW_NAME} INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_subdirectory(fsfw)
--- a/tests/src/fsfw/CMakeLists.txt
+++ b/tests/src/fsfw/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(tests)
--- a/tests/src/fsfw/tests/CMakeLists.txt
+++ b/tests/src/fsfw/tests/CMakeLists.txt
@@ -0,0 +1,8 @@
+
+if(FSFW_ADD_INTERNAL_TESTS)
+    add_subdirectory(internal)
+endif()
+
+if(FSFW_ADD_UNITTESTS)
+    add_subdirectory(unit)
+endif()
--- a/tests/src/fsfw/tests/internal/CMakeLists.txt
+++ b/tests/src/fsfw/tests/internal/CMakeLists.txt
--- a/tests/src/fsfw/tests/internal/InternalUnitTester.cpp
+++ b/tests/src/fsfw/tests/internal/InternalUnitTester.cpp
--- a/tests/src/fsfw/tests/internal/InternalUnitTester.h
+++ b/tests/src/fsfw/tests/internal/InternalUnitTester.h
--- a/tests/src/fsfw/tests/internal/UnittDefinitions.cpp
+++ b/tests/src/fsfw/tests/internal/UnittDefinitions.cpp
--- a/tests/src/fsfw/tests/internal/UnittDefinitions.h
+++ b/tests/src/fsfw/tests/internal/UnittDefinitions.h
--- a/tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt
+++ b/tests/src/fsfw/tests/internal/globalfunctions/CMakeLists.txt
--- a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp
+++ b/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.cpp
--- a/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h
+++ b/tests/src/fsfw/tests/internal/globalfunctions/TestArrayPrinter.h
--- a/tests/src/fsfw/tests/internal/osal/CMakeLists.txt
+++ b/tests/src/fsfw/tests/internal/osal/CMakeLists.txt
--- a/tests/src/fsfw/tests/internal/osal/IntTestMq.cpp
+++ b/tests/src/fsfw/tests/internal/osal/IntTestMq.cpp
--- a/tests/src/fsfw/tests/internal/osal/IntTestMq.h
+++ b/tests/src/fsfw/tests/internal/osal/IntTestMq.h
--- a/tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp
+++ b/tests/src/fsfw/tests/internal/osal/IntTestMutex.cpp
--- a/tests/src/fsfw/tests/internal/osal/IntTestMutex.h
+++ b/tests/src/fsfw/tests/internal/osal/IntTestMutex.h
--- a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp
+++ b/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.cpp
--- a/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h
+++ b/tests/src/fsfw/tests/internal/osal/IntTestSemaphore.h
--- a/tests/src/fsfw/tests/internal/serialize/CMakeLists.txt
+++ b/tests/src/fsfw/tests/internal/serialize/CMakeLists.txt
--- a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp
+++ b/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.cpp
--- a/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h
+++ b/tests/src/fsfw/tests/internal/serialize/IntTestSerialization.h
--- a/tests/src/fsfw/tests/unit/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/CMakeLists.txt
@@ -4,3 +4,5 @@ add_subdirectory(osal)
 add_subdirectory(serialize)
 add_subdirectory(datapoollocal)
 add_subdirectory(storagemanager)
+add_subdirectory(globalfunctions)
+add_subdirectory(tmtcpacket)
--- a/tests/src/fsfw/tests/unit/action/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/action/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp
+++ b/tests/src/fsfw/tests/unit/action/TestActionHelper.cpp
--- a/tests/src/fsfw/tests/unit/action/TestActionHelper.h
+++ b/tests/src/fsfw/tests/unit/action/TestActionHelper.h
--- a/tests/src/fsfw/tests/unit/container/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/container/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/container/RingBufferTest.cpp
+++ b/tests/src/fsfw/tests/unit/container/RingBufferTest.cpp
--- a/tests/src/fsfw/tests/unit/container/TestArrayList.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestArrayList.cpp
--- a/tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestDynamicFifo.cpp
--- a/tests/src/fsfw/tests/unit/container/TestFifo.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestFifo.cpp
--- a/tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestFixedArrayList.cpp
--- a/tests/src/fsfw/tests/unit/container/TestFixedMap.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestFixedMap.cpp
--- a/tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestFixedOrderedMultimap.cpp
--- a/tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp
+++ b/tests/src/fsfw/tests/unit/container/TestPlacementFactory.cpp
--- a/tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/datapoollocal/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp
+++ b/tests/src/fsfw/tests/unit/datapoollocal/DataSetTest.cpp
--- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp
+++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolManagerTest.cpp
--- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
+++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.cpp
--- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h
+++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolOwnerBase.h
--- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp
+++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVariableTest.cpp
--- a/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp
+++ b/tests/src/fsfw/tests/unit/datapoollocal/LocalPoolVectorTest.cpp
--- a/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/globalfunctions/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h
+++ b/tests/src/fsfw/tests/unit/mocks/HkReceiverMock.h
--- a/tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h
+++ b/tests/src/fsfw/tests/unit/mocks/MessageQueueMockBase.h
--- a/tests/src/fsfw/tests/unit/osal/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/osal/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp
+++ b/tests/src/fsfw/tests/unit/osal/TestMessageQueue.cpp
--- a/tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp
+++ b/tests/src/fsfw/tests/unit/osal/TestSemaphore.cpp
--- a/tests/src/fsfw/tests/unit/serialize/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/serialize/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp
+++ b/tests/src/fsfw/tests/unit/serialize/TestSerialBufferAdapter.cpp
--- a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp
+++ b/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.cpp
--- a/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h
+++ b/tests/src/fsfw/tests/unit/serialize/TestSerialLinkedPacket.h
--- a/tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp
+++ b/tests/src/fsfw/tests/unit/serialize/TestSerialization.cpp
--- a/tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/storagemanager/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp
+++ b/tests/src/fsfw/tests/unit/storagemanager/TestNewAccessor.cpp
--- a/tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp
+++ b/tests/src/fsfw/tests/unit/storagemanager/TestPool.cpp
--- a/tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt
+++ b/tests/src/fsfw/tests/unit/tmtcpacket/CMakeLists.txt
--- a/tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp
+++ b/tests/src/fsfw/tests/unit/tmtcpacket/PusTmTest.cpp