AliceO2Group
diff --git a/‎CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions b/‎CMakeLists.txt‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎Framework/Core/CMakeLists.txt‎
Lines changed: 89 additions & 76 deletions b/‎Framework/Core/CMakeLists.txt‎
Lines changed: 89 additions & 76 deletions
diff --git a/‎Framework/Core/test/Mocking.h‎
Lines changed: 3 additions & 0 deletions b/‎Framework/Core/test/Mocking.h‎
Lines changed: 3 additions & 0 deletions
@@ -138,3 +138,4 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
 endif()
 
 set_root_pcm_dependencies()
+
@@ -170,84 +170,97 @@ o2_target_root_dictionary(Framework
                           include/Framework/StepTHn.h
                           LINKDEF test/FrameworkCoreTestLinkDef.h)
 
-foreach(t
-        AlgorithmSpec
-        AlgorithmWrapper
-        AnalysisTask
-        AnalysisDataModel
-        AsyncQueue
-        ASoA
-        ASoAHelpers
-        BoostOptionsRetriever
-        ConfigurationOptionsRetriever
-        CallbackRegistry
-        ChannelSpecHelpers
-        CheckTypes
-        CompletionPolicy
-        ComputingResourceHelpers
-        ComputingQuotaEvaluator
-        ControlServiceHelpers
-        ConfigParamStore
-        ConfigParamRegistry
-        DataDescriptorMatcher
-        DataDescriptorQueryBuilder
-        DataProcessorSpec
-        DataRefUtils
-        DataRelayer
-        DeviceConfigInfo
-        DeviceMetricsInfo
-        DeviceSpec
-        DeviceSpecHelpers
-        DeviceStateHelpers
-        Expressions
-        ExternalFairMQDeviceProxy
-        FairMQOptionsRetriever
-        FairMQResizableBuffer
-        FairMQ
-        FrameworkDataFlowToDDS
-        FrameworkDataFlowToO2Control
-        Graphviz
-        GroupSlicer
-        HistogramRegistry
-        HTTPParser
-        IndexBuilder
-        InputRecord
-        InputRecordWalker
-        InputSpan
-        InputSpec
-        Kernels
-        LogParsingHelpers
-        Mermaid
-        OptionsHelpers
-        OverrideLabels
-        O2DataModelHelpers
-        PtrHelpers
-        RootConfigParamHelpers
-        Services
-        StringHelpers
-        StaticFor
-        SuppressionGenerator
-        TMessageSerializer
-        TableBuilder
-        TimeParallelPipelining
-        Timers
-        TimesliceIndex
-        TypeTraits
-        Variants
-        WorkflowHelpers
-        WorkflowSerialization
-        TreeToTable
-        DataOutputDirector)
+add_executable(o2-test-framework-core
+              test/test_AlgorithmSpec.cxx
+              test/test_AnalysisTask.cxx
+              test/test_AnalysisDataModel.cxx
+              test/test_AsyncQueue.cxx
+              test/test_ASoA.cxx
+              test/test_ASoAHelpers.cxx
+              test/test_BoostOptionsRetriever.cxx
+              test/test_ConfigurationOptionsRetriever.cxx
+              test/test_CallbackRegistry.cxx
+              test/test_ChannelSpecHelpers.cxx
+              test/test_CheckTypes.cxx
+              test/test_CompletionPolicy.cxx
+              test/test_ComputingResourceHelpers.cxx
+              test/test_ComputingQuotaEvaluator.cxx
+              test/test_ControlServiceHelpers.cxx
+              test/test_ConfigParamStore.cxx
+              test/test_ConfigParamRegistry.cxx
+              test/test_DataDescriptorMatcher.cxx
+              test/test_DataDescriptorQueryBuilder.cxx
+              test/test_DataProcessorSpec.cxx
+              test/test_DataRefUtils.cxx
+              test/test_DataRelayer.cxx
+              test/test_DeviceConfigInfo.cxx
+              test/test_DeviceMetricsInfo.cxx
+              test/test_DeviceSpec.cxx
+              test/test_DeviceSpecHelpers.cxx
+              test/test_DeviceStateHelpers.cxx
+              test/test_Expressions.cxx
+              test/test_ExternalFairMQDeviceProxy.cxx
+              test/test_FairMQOptionsRetriever.cxx
+              test/test_FairMQResizableBuffer.cxx
+              test/test_FairMQ.cxx
+              test/test_FrameworkDataFlowToDDS.cxx
+              test/test_FrameworkDataFlowToO2Control.cxx
+              test/test_Graphviz.cxx
+              test/test_GroupSlicer.cxx
+              test/test_HistogramRegistry.cxx
+              test/test_HTTPParser.cxx
+              test/test_IndexBuilder.cxx
+              test/test_InputRecord.cxx
+              test/test_InputRecordWalker.cxx
+              test/test_InputSpan.cxx
+              test/test_InputSpec.cxx
+              test/test_Kernels.cxx
+              test/test_LogParsingHelpers.cxx
+              test/test_Mermaid.cxx
+              test/test_OptionsHelpers.cxx
+              test/test_OverrideLabels.cxx
+              test/test_O2DataModelHelpers.cxx
+              test/test_PtrHelpers.cxx
+              test/test_RootConfigParamHelpers.cxx
+              test/test_Services.cxx
+              test/test_StringHelpers.cxx
+              test/test_StaticFor.cxx
+              test/test_TMessageSerializer.cxx
+              test/test_TableBuilder.cxx
+              test/test_TimeParallelPipelining.cxx
+              test/test_TimesliceIndex.cxx
+              test/test_TypeTraits.cxx
+              test/test_Variants.cxx
+              test/test_WorkflowHelpers.cxx
+              test/test_WorkflowSerialization.cxx
+              test/test_TreeToTable.cxx
+              test/test_DataOutputDirector.cxx
+            )
+target_link_libraries(o2-test-framework-core PRIVATE O2::Framework)
+target_link_libraries(o2-test-framework-core PRIVATE O2::Catch2)
 
-  # FIXME ? The NAME parameter of o2_add_test is only needed to help the current
-  # o2.sh recipe. If the recipe is changed, those params can go away, if needed.
+get_filename_component(outdir ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/../tests ABSOLUTE)
+set_property(TARGET o2-test-framework-core PROPERTY RUNTIME_OUTPUT_DIRECTORY ${outdir})
 
-  o2_add_test(${t} NAME test_Framework_test_${t}
-              SOURCES test/test_${t}.cxx
-              COMPONENT_NAME Framework
-              LABELS framework
-              PUBLIC_LINK_LIBRARIES O2::Framework)
-endforeach()
+add_test(NAME framework:core COMMAND o2-test-framework-core)
+
+o2_add_test(AlgorithmWrapper NAME test_Framework_test_AlgorithmWrapper  
+            SOURCES test/test_AlgorithmWrapper.cxx
+            COMPONENT_NAME Framework
+            LABELS framework
+            PUBLIC_LINK_LIBRARIES O2::Framework)
+
+o2_add_test(Timers NAME test_Framework_test_Timers
+            SOURCES test/test_Timers.cxx
+            COMPONENT_NAME Framework
+            LABELS framework
+            PUBLIC_LINK_LIBRARIES O2::Framework)
+
+o2_add_test(SuppressionGenerator NAME test_Framework_test_SuppressionGenerator
+            SOURCES test/test_SuppressionGenerator.cxx
+            COMPONENT_NAME Framework
+            LABELS framework
+            PUBLIC_LINK_LIBRARIES O2::Framework)
 
 o2_add_test(O2DatabasePDG NAME test_Framework_test_O2DatabasePDG
             SOURCES test/test_O2DatabasePDG.cxx
 
@@ -16,6 +16,8 @@
 #include "Framework/WorkflowCustomizationHelpers.h"
 #include "Framework/ChannelConfigurationPolicy.h"
 
+namespace
+{
 std::unique_ptr<o2::framework::ConfigContext> makeEmptyConfigContext()
 {
   using namespace o2::framework;
@@ -53,3 +55,4 @@ std::vector<ChannelConfigurationPolicy> makeTrivialChannelPolicies(ConfigContext
 
   return {defaultPolicy};
 }
+} // namespace
Original file line number	Diff line number	Diff line change
`@@ -138,3 +138,4 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)`
`138`	`138`	`endif()`
`139`	`139`
`140`	`140`	`set_root_pcm_dependencies()`
	`141`	`+`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`#include "Framework/WorkflowCustomizationHelpers.h"`
`17`	`17`	`#include "Framework/ChannelConfigurationPolicy.h"`
`18`	`18`
	`19`	`+namespace`
	`20`	`+{`
`19`	`21`	`std::unique_ptr<o2::framework::ConfigContext> makeEmptyConfigContext()`
`20`	`22`	`{`
`21`	`23`	`using namespace o2::framework;`
`@@ -53,3 +55,4 @@ std::vector<ChannelConfigurationPolicy> makeTrivialChannelPolicies(ConfigContext`
`53`	`55`
`54`	`56`	`return {defaultPolicy};`
`55`	`57`	`}`
	`58`	`+} // namespace`